From 2fea92e31db28cb9fc1d0f3c336c7556ac5dc473 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 17 Dec 2008 11:30:56 -0500
Subject: [PATCH 001/143] Add :ha >file.ps

---
 common/content/buffer.js        | 33 +++++++++++++++++--------
 common/content/commands.js      | 44 ++++++++++++++++++---------------
 common/content/io.js            |  3 +--
 common/content/options.js       | 37 +++++++++++++++++++++++++--
 vimperator/content/bookmarks.js |  1 +
 5 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index e6a15cd7..4a95beb5 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -483,21 +483,34 @@ function Buffer() //{{{
         "Print current document",
         function (args)
         {
-            let aps = options.getPref("print.always_print_silent");
-            let spp = options.getPref("print.show_print_progress");
+            options.temporaryContext(function () {
+                if (args[0])
+                {
+                    if (args[0][0] != ">")
+                        return liberator.echoerr("E488: Trailing characters");
+                    options.setPref("print.print_to_file", "true");
+                    options.setPref("print.print_to_filename", io.getFile(args[0].substr(1)).path);
+                    liberator.echomsg("Printing to file: " + args[0].substr(1));
+                }
+                else
+                {
+                    liberator.echomsg("Sending to printer...");
+                }
 
-            liberator.echomsg("Sending to printer...");
-            options.setPref("print.always_print_silent", args.bang);
-            options.setPref("print.show_print_progress", !args.bang);
+                options.setPref("print.always_print_silent", args.bang);
+                options.setPref("print.show_print_progress", !args.bang);
 
-            getBrowser().contentWindow.print();
+                getBrowser().contentWindow.print();
+            });
 
-            options.setPref("print.always_print_silent", aps);
-            options.setPref("print.show_print_progress", spp);
-            liberator.echomsg("Print job sent.");
+            if (args[0])
+                liberator.echomsg("Printed: " + args[0].substr(1));
+            else
+                liberator.echomsg("Print job sent.");
         },
         {
-            argCount: "0",
+            argCount: "?",
+            literal: 0,
             bang: true
         });
 
diff --git a/common/content/commands.js b/common/content/commands.js
index c5d7c3ae..67540eb9 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -758,9 +758,30 @@ function Commands() //{{{
                 if (completeOpt)
                 {
                     if (/^custom,/.test(completeOpt))
-                        completeFunc = completeOpt.substr(7);
+                    {
+                        completeFunc = function ()
+                        {
+                            try
+                            {
+                                var completer = liberator.eval(completeOpt.substr(7));
+
+                                if (!(completer instanceof Function))
+                                    throw new TypeError("User-defined custom completer '" + completeOpt.substr(7) + "' is not a function");
+                            }
+                            catch (e)
+                            {
+                                // FIXME: should be pushed to the MOW
+                                liberator.echoerr("E117: Unknown function: " + completeOpt.substr(7));
+                                liberator.log(e);
+                                return undefined;
+                            }
+                            return completer.apply(this, Array.slice(arguments));
+                        }
+                    }
                     else 
-                        completeFunc = "completion." + completeOptionMap[completeOpt];
+                    {
+                        completeFunc = function () completion[completeOptionMap[completeOpt]].apply(this, Array.slice(arguments));
+                    }
                 }
 
                 if (!commands.addUserCommand(
@@ -773,24 +794,7 @@ function Commands() //{{{
                             count: countOpt,
                             completer: function (context, args) {
                                 if (completeFunc)
-                                {
-                                    try
-                                    {
-                                        var completer = liberator.eval(completeFunc);
-
-                                        if (!(completer instanceof Function))
-                                            throw new TypeError("User-defined custom completer '" + completeFunc + "' is not a function");
-                                    }
-                                    catch (e)
-                                    {
-                                        // FIXME: should be pushed to the MOW
-                                        liberator.echoerr("E117: Unknown function: " + completeFunc);
-                                        liberator.log(e);
-                                        return;
-                                    }
-
-                                    completer.call(completion, context, args)
-                                }
+                                    return completeFunc(context, args)
                             },
                             replacementText: args.literalArg
                         },
diff --git a/common/content/io.js b/common/content/io.js
index d6bf284a..52fd0ed7 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -99,8 +99,7 @@ function IO() //{{{
             return [];
         else
             // empty list item means the current directory
-            return list.replace(/,$/, "")
-                       .split(",")
+            return list.replace(/,$/, "").split(",")
                        .map(function (dir) dir == "" ? io.getCurrentDirectory().path : dir);
     }
 
diff --git a/common/content/options.js b/common/content/options.js
index 34828e18..54cc90a2 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -302,7 +302,9 @@ function Options() //{{{
     const SAVED = "liberator.saved.";
 
     const prefService = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-    var optionHash = {};
+    const optionHash = {};
+
+    const prefContexts = [];
 
     function optionObserver(key, event, option)
     {
@@ -320,6 +322,13 @@ function Options() //{{{
 
     function storePreference(name, value)
     {
+        if (prefContexts.length)
+        {
+            let val = loadPreference(name, null);
+            if (val != null)
+                prefContexts[prefContexts.length - 1][name] = val;
+        }
+
         var type = prefService.getPrefType(name);
         switch (typeof value)
         {
@@ -988,7 +997,31 @@ function Options() //{{{
                 this.setPref(name, !this.getPref(name));
             else
                 liberator.echoerr("E488: Trailing characters: " + name + "!");
-        }
+        },
+
+        pushContext: function ()
+        {
+            prefContexts.push({});
+        },
+
+        popContext: function ()
+        {
+            for (let [k, v] in Iterator(prefContexts.pop()))
+                storePreference(k, v);
+        },
+
+        temporaryContext: function (fn, self)
+        {
+            try
+            {
+                this.pushContext();
+                return fn.call(self);
+            }
+            finally
+            {
+                this.popContext();
+            }
+        },
     };
     //}}}
 }; //}}}
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index fbcd419f..53c37601 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -701,6 +701,7 @@ function History() //{{{
 
                 context.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index, 0, true))];
                 context.keys = { text: function (item) item.URI.spec, description: "title" };
+                liberator.dump(context.items);
             },
             count: true,
             literal: 0

From b7e6103d56972ccec4305395ba3d707f0618f58a Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 17 Dec 2008 22:36:56 -0500
Subject: [PATCH 002/143] Add :silent command

---
 common/content/ui.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/common/content/ui.js b/common/content/ui.js
index 89e5009a..dc2c314b 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -841,6 +841,17 @@ function CommandLine() //{{{
         },
         { argCount: "0" });
 
+    commands.add(["sil[ent]"],
+        "Run a command silently",
+        function (args)
+        {
+            commandline.runSilently(function () liberator.execute(args[0]));
+        },
+        {
+            completer: function (context) completion.ex(context),
+            literal: 0
+        });
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{

From cdcfb68e3b02af206c2bf971292abe2cab853433 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 17 Dec 2008 23:16:20 -0500
Subject: [PATCH 003/143] Add ''

---
 common/content/buffer.js    | 34 ++++++++++++++++++++++++----------
 common/content/liberator.js |  2 +-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 4a95beb5..af08876c 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -115,6 +115,7 @@ function Buffer() //{{{
         else
             v = win.scrollMaxY / 100 * vertical;
 
+        marks.add("'", true);
         win.scrollTo(h, v);
     }
 
@@ -1156,6 +1157,17 @@ function Buffer() //{{{
             scrollToPercentiles(-1, percentage);
         },
 
+        scrollToRatio: function (x, y)
+        {
+            scrollToPercentiles(x * 100, y * 100);
+        },
+
+        scrollTo: function (x, y)
+        {
+            marks.add("'", true);
+            content.scrollTo(x, y);
+        },
+
         scrollStart: function ()
         {
             scrollToPercentiles(0, -1);
@@ -1340,12 +1352,11 @@ function Marks() //{{{
     function onPageLoad(event)
     {
         let win = event.originalTarget.defaultView;
-        for (let i = 0, length = pendingJumps.length; i < length; i++)
+        for (let [i, mark] in Iterator(pendingJumps))
         {
-            let mark = pendingJumps[i];
             if (win && win.location.href == mark.location)
             {
-                win.scrollTo(mark.position.x * win.scrollMaxX, mark.position.y * win.scrollMaxY);
+                buffer.scrollToRatio(mark.position.x, mark.position.y);
                 pendingJumps.splice(i, 1);
                 return;
             }
@@ -1390,7 +1401,7 @@ function Marks() //{{{
         }
     }
 
-    function isLocalMark(mark) /^[a-z]$/.test(mark);
+    function isLocalMark(mark) /^['"a-z]$/.test(mark);
     function isURLMark(mark) /^[A-Z0-9]$/.test(mark);
 
     function localMarkIter()
@@ -1537,13 +1548,14 @@ function Marks() //{{{
     return {
 
         // TODO: add support for frameset pages
-        add: function (mark)
+        add: function (mark, silent)
         {
             let win = window.content;
 
             if (win.document.body.localName.toLowerCase() == "frameset")
             {
-                liberator.echoerr("Marks support for frameset pages not implemented yet");
+                if (!silent)
+                    liberator.echoerr("Marks support for frameset pages not implemented yet");
                 return;
             }
 
@@ -1554,7 +1566,8 @@ function Marks() //{{{
             if (isURLMark(mark))
             {
                 urlMarks.set(mark, { location: win.location.href, position: position, tab: tabs.getTab() });
-                liberator.log("Adding URL mark: " + markToString(mark, urlMarks.get(mark)), 5);
+                if (!silent)
+                    liberator.log("Adding URL mark: " + markToString(mark, urlMarks.get(mark)), 5);
             }
             else if (isLocalMark(mark))
             {
@@ -1564,7 +1577,8 @@ function Marks() //{{{
                     localMarks.set(mark, []);
                 let vals = { location: win.location.href, position: position };
                 localMarks.get(mark).push(vals);
-                liberator.log("Adding local mark: " + markToString(mark, vals), 5);
+                if (!silent)
+                    liberator.log("Adding local mark: " + markToString(mark, vals), 5);
             }
         },
 
@@ -1621,7 +1635,7 @@ function Marks() //{{{
                             return;
                         }
                         liberator.log("Jumping to URL mark: " + markToString(mark, slice), 5);
-                        win.scrollTo(slice.position.x * win.scrollMaxX, slice.position.y * win.scrollMaxY);
+                        buffer.scrollToRatio(slice.position.x, slice.position.y);
                         ok = true;
                     }
                 }
@@ -1636,7 +1650,7 @@ function Marks() //{{{
                     if (win.location.href == lmark.location)
                     {
                         liberator.log("Jumping to local mark: " + markToString(mark, lmark), 5);
-                        win.scrollTo(lmark.position.x * win.scrollMaxX, lmark.position.y * win.scrollMaxY);
+                        buffer.scrollToRatio(lmark.position.x, lmark.position.y);
                         ok = true;
                         break;
                     }
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 6b009c12..bf7a14f2 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -952,7 +952,7 @@ const liberator = (function () //{{{
                 setTimeout(function () {
                     let elem = buffer.evaluateXPath('//*[@class="tag" and text()="' + tag + '"]').snapshotItem(0);
                     if (elem)
-                        window.content.scrollTo(0, elem.getBoundingClientRect().top - 10); // 10px context
+                        buffer.scrollTo(0, elem.getBoundingClientRect().top - 10); // 10px context
                     else
                         liberator.dump('no element: ' + '@class="tag" and text()="' + tag + '"\n' );
                 }, 500);

From 26f362af57f9909edd85d75f0c31d08d9b5b2bcf Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 18 Dec 2008 00:16:49 -0500
Subject: [PATCH 004/143] Check asciidoc version on 'make doc'

---
 common/Makefile.common | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/Makefile.common b/common/Makefile.common
index 110a1163..4cac38e4 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -63,7 +63,8 @@ info:
 	@echo -e "jar files           $(shell echo ${JAR_FILES} | sed 's/ /\\n                    /g' )"
 	@echo    "xpi files           ${XPI_FILES}"
 
-doc: ${DOC_FILES}
+.PHONY: check-asciidoc
+doc: check-asciidoc ${DOC_FILES}
 xpi: ${XPI}
 jar: ${JAR}
 
@@ -104,6 +105,10 @@ $(JAR): doc
 
 #### doc
 
+check-asciidoc:
+	@asciidoc --version | awk '{ exit $$2 !~ /^8\.2\./ }' || \
+		echo >&2 "Warning: asciidoc versions other 8.2.x are unsupported"
+
 ${DOC_FILES}: %.html: %.txt $(BASE)/Makefile.common locale/en-US/asciidoc.conf
 	@echo "DOC $@"
 	${ASCIIDOC} --unsafe -a linkcss -a quirks! -a doctitle="$(shell basename $@)" -o $@ $<

From e082160a21f7e447ef717d3ef61829301e01a8fe Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 18 Dec 2008 13:59:59 -0500
Subject: [PATCH 005/143] Don't anchor help completions.

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

diff --git a/common/content/completion.js b/common/content/completion.js
index f008e7ff..bf4a9622 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1374,6 +1374,7 @@ function Completion() //{{{
         help: function help(context)
         {
             context.title = ["Help"];
+            context.anchored = false;
             context.generate = function ()
             {
                 let res = config.helpFiles.map(function (file) {

From b18b1634fcda9c24a3466464ec462b756cb05134 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 18 Dec 2008 21:27:33 -0500
Subject: [PATCH 006/143] Kludge the stupid urlbar focus bug better

---
 common/content/events.js | 123 +++++++++++++++++++++------------------
 common/content/modes.js  |  10 +---
 2 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 3eadb398..401244ba 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -33,6 +33,7 @@ function AutoCommands() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var store = [];
+    var lastFocus = null;
 
     function matchAutoCmd(autoCmd, event, regex)
     {
@@ -1086,65 +1087,77 @@ function Events() //{{{
             if (win && win.top == content && liberator.has("tabs"))
                 tabs.localStore.focusedFrame = win;
 
-            if (elem && elem.readOnly)
-                return;
-
-            if (elem && (
-                   (elem instanceof HTMLInputElement && (elem.type.toLowerCase() == "text" || elem.type.toLowerCase() == "password")) ||
-                   (elem instanceof HTMLSelectElement)
-                ))
+            try
             {
-                this.wantsModeReset = false;
-                liberator.mode = modes.INSERT;
-                if (hasHTMLDocument(win))
-                    buffer.lastInputField = elem;
-                return;
-            }
+                if (elem && elem.readOnly)
+                    return;
 
-            if (elem && elem instanceof HTMLTextAreaElement)
-            {
-                this.wantsModeReset = false;
-                if (options["insertmode"])
-                    modes.set(modes.INSERT, modes.TEXTAREA);
-                else if (elem.selectionEnd - elem.selectionStart > 0)
-                    modes.set(modes.VISUAL, modes.TEXTAREA);
-                else
-                    modes.main = modes.TEXTAREA;
-                if (hasHTMLDocument(win))
-                    buffer.lastInputField = elem;
-                return;
-            }
-
-            if (config.name == "Muttator")
-            {
-                // we switch to -- MESSAGE -- mode for muttator, when the main HTML widget gets focus
-                if (hasHTMLDocument(win) || elem instanceof HTMLAnchorElement)
+                if ((elem instanceof HTMLInputElement && /^(text|password)$/.test(elem.type)) ||
+                    (elem instanceof HTMLSelectElement))
                 {
-                    if (config.isComposeWindow)
-                    {
-                        liberator.dump("Compose editor got focus");
-                        modes.set(modes.INSERT, modes.TEXTAREA);
-                    }
-                    else if (liberator.mode != modes.MESSAGE)
-                        liberator.mode = modes.MESSAGE;
+                    this.wantsModeReset = false;
+                    liberator.mode = modes.INSERT;
+                    if (hasHTMLDocument(win))
+                        buffer.lastInputField = elem;
                     return;
                 }
-            }
 
-            if (liberator.mode == modes.INSERT ||
-                liberator.mode == modes.TEXTAREA ||
-                liberator.mode == modes.MESSAGE ||
-                liberator.mode == modes.VISUAL)
+                if (elem instanceof HTMLTextAreaElement)
+                {
+                    this.wantsModeReset = false;
+                    if (options["insertmode"])
+                        modes.set(modes.INSERT, modes.TEXTAREA);
+                    else if (elem.selectionEnd - elem.selectionStart > 0)
+                        modes.set(modes.VISUAL, modes.TEXTAREA);
+                    else
+                        modes.main = modes.TEXTAREA;
+                    if (hasHTMLDocument(win))
+                        buffer.lastInputField = elem;
+                    return;
+                }
+
+                if (config.name == "Muttator")
+                {
+                    // we switch to -- MESSAGE -- mode for muttator, when the main HTML widget gets focus
+                    if (hasHTMLDocument(win) || elem instanceof HTMLAnchorElement)
+                    {
+                        if (config.isComposeWindow)
+                        {
+                            liberator.dump("Compose editor got focus");
+                            modes.set(modes.INSERT, modes.TEXTAREA);
+                        }
+                        else if (liberator.mode != modes.MESSAGE)
+                            liberator.mode = modes.MESSAGE;
+                        return;
+                    }
+                }
+
+                urlbar = document.getElementById("urlbar");
+                if (focus == null && urlbar && urlbar.inputField == lastFocus)
+                    liberator.threadYield(true);
+
+                if (liberator.mode & (modes.INSERT | modes.TEXTAREA | modes.MESSAGE | modes.VISUAL))
+                {
+                     if (0) // FIXME: currently this hack is disabled to make macros work
+                     {
+                         this.wantsModeReset = true;
+                         setTimeout(function () {
+                             if (events.wantsModeReset)
+                             {
+                                 events.wantsModeReset = false;
+                                 modes.reset();
+                             }
+                         }, 0);
+                     }
+                     else
+                     {
+                         modes.reset();
+                     }
+                }
+            }
+            finally
             {
-               // FIXME: currently this hack is disabled to make macros work
-               // this.wantsModeReset = true;
-               // setTimeout(function () {
-               //     if (events.wantsModeReset)
-               //     {
-               //         events.wantsModeReset = false;
-               modes.reset();
-               //     }
-               // }, 0);
+                lastFocus = elem;
             }
         },
 
@@ -1198,7 +1211,6 @@ function Events() //{{{
                         catch (e) {}
 
                         modes.reset();
-                        liberator.focusContent(true);
                         break;
 
                     case modes.VISUAL:
@@ -1216,14 +1228,9 @@ function Events() //{{{
 
                     case modes.INSERT:
                         if ((modes.extended & modes.TEXTAREA) && !options["insertmode"])
-                        {
                             liberator.mode = modes.TEXTAREA;
-                        }
                         else
-                        {
                             modes.reset();
-                            liberator.focusContent(true);
-                        }
                         break;
 
                     default: // HINTS, CUSTOM or COMMAND_LINE
diff --git a/common/content/modes.js b/common/content/modes.js
index de88c3be..b016048b 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -116,13 +116,7 @@ const modes = (function () //{{{
                 options.setPref("accessibility.browsewithcaret", false);
 
             statusline.updateUrl();
-            // Kludge to prevent the input field losing focus on MS/Mac
-            setTimeout(function () {
-                let focus = document.commandDispatcher.focusedElement;
-                let urlbar = document.getElementById("urlbar");
-                if (!urlbar || focus != urlbar.inputField)
-                    liberator.focusContent(false);
-            }, 0);
+            liberator.focusContent(false);
         }
     }
 
@@ -137,6 +131,8 @@ const modes = (function () //{{{
 
         get all() mainModes.slice(),
 
+        get inputMode() main & (this.COMMAND_LINE | this.INPUT | this.TEXTAREA | this.COMPOSE),
+
         addMode: function (name, extended, display) {
             let disp = name.replace("_", " ", "g");
             this[name] = 1 << lastMode++;

From f2f8cdbea3bee03a4ff4d55cf6e6538ac44c96bd Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 18 Dec 2008 21:41:56 -0500
Subject: [PATCH 007/143] Don't hide errors on bad URLs, they're useful
 feedback

---
 common/content/liberator.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 819bc3a3..9ce88e78 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1090,11 +1090,7 @@ const liberator = (function () //{{{
                 switch (where)
                 {
                     case liberator.CURRENT_TAB:
-                        try
-                        {
-                          getBrowser().loadURIWithFlags(url, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, postdata);
-                        }
-                        catch (e) {}
+                        getBrowser().loadURIWithFlags(url, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, postdata);
                         break;
 
                     case liberator.NEW_BACKGROUND_TAB:
@@ -1111,11 +1107,7 @@ const liberator = (function () //{{{
                         const wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
                         window.open();
                         whichwindow = wm.getMostRecentWindow("navigator:browser");
-                        try
-                        {
-                          whichwindow.loadURI(url, null, postdata);
-                        }
-                        catch (e) {}
+                        whichwindow.loadURI(url, null, postdata);
                         break;
 
                     default:

From 66bd21ec30a20bb6a3bbceeacdff7260c2b36aa4 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 18 Dec 2008 21:47:36 -0500
Subject: [PATCH 008/143] Default to opening multiple URLs in windows instead
 of tabs when !has("tabs")

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

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 9ce88e78..242fde11 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1099,6 +1099,7 @@ const liberator = (function () //{{{
                             return open(urls, liberator.NEW_WINDOW);
 
                         let tab = getBrowser().addTab(url, null, null, postdata);
+
                         if (where == liberator.NEW_TAB)
                             getBrowser().selectedTab = tab;
                         break;
@@ -1124,8 +1125,6 @@ const liberator = (function () //{{{
             for (let [i, url] in Iterator(urls))
             {
                 open(url, where);
-                if (i == 0 && !liberator.has("tabs"))
-                    break;
                 where = liberator.NEW_BACKGROUND_TAB;
             }
 

From e56a93a06040767844a746c0604513fecd33e795 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 00:17:18 -0500
Subject: [PATCH 009/143] Start documenting CompletionContext

---
 common/content/completion.js | 129 ++++++++++++++++++++++++++++++++++-
 1 file changed, 128 insertions(+), 1 deletion(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index bf4a9622..1ce28900 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -26,6 +26,25 @@ 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 *****/
 
+/** 
+ * Creates a new completion context.
+ *
+ * @class A class to provide contexts for command completion.
+ * Manages the filtering and formatting of completions, and keeps
+ * track of the positions and quoting of replacement text. Allows for
+ * the creation of sub-contexts with different headers and quoting
+ * rules.
+ *
+ * @param {nsIEditor} editor The editor for which completion is
+ *     intended. May be a {CompletionContext} when forking a context,
+ *     or a {string} when creating a new one.
+ * @param {string} name The name of this context. Used when the
+ *     context is forked.
+ * @param {number} offset The offset from the parent context.
+ * @author Kris Maglione <maglione.k@gmail.com>
+ * @constructor
+ */
+
 function CompletionContext(editor, name, offset) //{{{
 {
     if (!(this instanceof arguments.callee))
@@ -44,7 +63,11 @@ function CompletionContext(editor, name, offset) //{{{
         else
             self.contexts[name] = this;
 
+        /** 
+         * @property {CompletionContext} This context's parent. {null} when this is a top-level context.
+         */
         self.parent = parent;
+
         ["filters", "keys", "title", "quote"].forEach(function (key)
             self[key] = parent[key] && util.cloneObject(parent[key]));
         ["anchored", "compare", "editor", "_filter", "filterFunc", "keys", "_process", "top"].forEach(function (key)
@@ -55,10 +78,20 @@ function CompletionContext(editor, name, offset) //{{{
         self.offset = parent.offset;
         self.advance(offset);
 
+        /**
+         * @property {boolean} Specifies that this context is not finished
+         *      generating results.
+         * @default false
+         */
         self.incomplete = false;
         self.message = null;
+        /**
+         * @property {boolean} Specifies that this context is waiting for the
+         *     user to press <Tab>. Useful when fetching completions could be
+         *     dangerous or slow, and the user has enabled autocomplete.
+         */
         self.waitingForTab = false;
-        //delete self._filter; // FIXME?
+
         delete self._generate;
         delete self._ignoreCase;
         if (self != this)
@@ -76,6 +109,11 @@ function CompletionContext(editor, name, offset) //{{{
             this.editor = editor;
         this.compare = function (a, b) String.localeCompare(a.text, b.text);
 
+        /**
+         * @property {function} The function used to filter the results.
+         * @default Selects all results which match every predicate in the
+         *     {@link #filters} array.
+         */
         this.filterFunc = function (items)
         {
                 let self = this;
@@ -83,6 +121,10 @@ function CompletionContext(editor, name, offset) //{{{
                     reduce(function (res, filter) res.filter(function (item) filter.call(self, item)),
                             items);
         }
+        /**
+         * @property {Array} An array of predicates on which to filter the
+         *     results.
+         */
         this.filters = [function (item) {
             let text = Array.concat(this.getKey(item, "text"));
             for (let [i, str] in Iterator(text))
@@ -95,22 +137,73 @@ function CompletionContext(editor, name, offset) //{{{
             }
             return false;
         }];
+        /**
+         * @property {boolean} Specifies whether this context results must
+         *     match the filter at the begining of the string.
+         * @default true
+         */
         this.anchored = true;
+        /**
+         * @property {Object} A map of all contexts, keyed on their names.
+         *    Names are assigned when a context is forked, with its specified
+         *    name appended, after a '/', to its parent's name.
+         */
         this.contexts = { name: this };
+        /**
+         * @property {Object} A mapping of keys, for {@link #getKey}. Given
+         *      { key: value }, getKey(item, key) will return values as such:
+         *      if value is a string, it will return item.item[value]. If it's a
+         *      function, it will return value(item.item).
+         */
         this.keys = { text: 0, description: 1, icon: "icon" };
+        /**
+         * @property {number} This context's offset from the begining of
+         *     {@link #editor}'s value.
+         */
         this.offset = offset || 0;
+        /**
+         * @property {function} A function which is called when any subcontext
+         *     changes its completion list. Only called when
+         *     {@link #updateAsync} is true.
+         */
         this.onUpdate = function () true;
+        /**
+         * @property {CompletionContext} The top-level completion context.
+         */
         this.top = this;
         this.__defineGetter__("incomplete", function () this.contextList.some(function (c) c.parent && c.incomplete));
         this.__defineGetter__("waitingForTab", function () this.contextList.some(function (c) c.parent && c.waitingForTab));
         this.reset();
     }
+    /**
+     * @property {Object} A general-purpose store for functions which need to
+     *     cache data between calls.
+     */
     this.cache = {};
+    /**
+     * @private
+     * @property {Object} A cache for return values of {@link #generate}.
+     */
     this.itemCache = {};
+    /**
+     * @property {string} A key detailing when the cached value of
+     *     {@link #generate} may be used. Every call to
+     *     {@link #generate} stores its result in {@link #itemCache}.
+     *     When itemCache[key] exists, its value is returned, and
+     *     {@link #generate} is not called again.
+     */
     this.key = "";
+    /**
+     * @property {string} A message to be shown before any results.
+     */
     this.message = null;
     this.name = name || "";
+    /** @private */
     this._completions = []; // FIXME
+    /**
+     * Returns a key, as detailed in {@link #keys}.
+     * @function
+     */
     this.getKey = function (item, key) (typeof self.keys[key] == "function") ? self.keys[key].call(this, item.item) :
             key in self.keys ? item.item[self.keys[key]]
                              : item.item[key];
@@ -118,6 +211,14 @@ function CompletionContext(editor, name, offset) //{{{
 
 CompletionContext.prototype = {
     // Temporary
+    /**
+     * @property {Object}
+     *
+     * An object describing the results from all sub-contexts. Results are
+     * adjusted so that all have the same starting offset.
+     *
+     * @deprecated
+     */
     get allItems()
     {
         try
@@ -372,6 +473,19 @@ CompletionContext.prototype = {
         return this._substrings = substrings;
     },
 
+    /**
+     * Advances the context <b>count</b> characters. {@link #filter} is
+     * advanced to match. If {@link #quote} is non-null, its prefix and suffix
+     * are set to the null-string.
+     *
+     * This function is still imperfect for quoted strings. When 
+     * {@link #quote} is non-null, it adjusts the count based on the quoted
+     * size of the <b>count</b>-character substring of the filter, which is
+     * accurate so long as unquoting and quoting a string will always map to
+     * the original quoted string, which is often not the case.
+     *
+     * @param {number} count The number of characters to advance the context.
+     */
     advance: function advance(count)
     {
         delete this._ignoreCase;
@@ -386,6 +500,12 @@ CompletionContext.prototype = {
             this._filter = this._filter.substr(count);
     },
 
+    /**
+     * Gets a key from {@link #cache}, setting it to <b>defVal</b> if it
+     * doesn't already exists.
+     * @param {string} key
+     * @param defVal
+     */
     getCache: function (key, defVal)
     {
         if (!(key in this.cache))
@@ -511,6 +631,13 @@ CompletionContext.prototype = {
         }
     },
 
+    /**
+     * Wait for all subcontexts to complete.
+     *
+     * @param {boolean} interruptable When true, the call may be interrupted
+     *    via <C-c>. In this case, "Interrupted" may be thrown.
+     * @param {number} timeout The maximum time, in milliseconds, to wait.
+     */
     wait: function wait(interruptable, timeout)
     {
         let end = Date.now() + timeout;

From 4fc2a56ddcf774c025baa45ab5bd0509c7fb4a4f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 19:07:17 +1100
Subject: [PATCH 010/143] brace formatting fixes

---
 common/content/commands.js   | 3 ++-
 common/content/completion.js | 3 ++-
 common/content/hints.js      | 6 ++++--
 common/content/mappings.js   | 3 ++-
 common/content/modes.js      | 5 +++--
 common/content/style.js      | 6 ++++--
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/common/content/commands.js b/common/content/commands.js
index 67540eb9..73beca92 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -792,7 +792,8 @@ function Commands() //{{{
                             argCount: nargsOpt,
                             bang: bangOpt,
                             count: countOpt,
-                            completer: function (context, args) {
+                            completer: function (context, args)
+                            {
                                 if (completeFunc)
                                     return completeFunc(context, args)
                             },
diff --git a/common/content/completion.js b/common/content/completion.js
index 1ce28900..f9ddee03 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1552,7 +1552,8 @@ function Completion() //{{{
             });
             completionService.stopSearch();
             completionService.startSearch(context.filter, "", context.result, {
-                onSearchResult: function onSearchResult(search, result) {
+                onSearchResult: function onSearchResult(search, result)
+                {
                     context.result = result;
                     timer.tell(result);
                     if (result.searchResult <= result.RESULT_SUCCESS)
diff --git a/common/content/hints.js b/common/content/hints.js
index ca55ac9a..55e8f043 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -581,12 +581,14 @@ function Hints() //{{{
 
     mappings.add(myModes, [";"],
         "Start an extended hint mode",
-        function (count) {
+        function (count)
+        {
             extendedhintCount = count;
             commandline.input(";", function (arg) { setTimeout(function () hints.show(arg), 0) },
                 {
                     promptHighlight: "Normal",
-                    completer: function (context) {
+                    completer: function (context)
+                    {
                         context.compare = function () 0;
                         context.completions = [[k, v.prompt] for ([k, v] in Iterator(hintModes))];
                     },
diff --git a/common/content/mappings.js b/common/content/mappings.js
index 13bb318a..7e35b115 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -190,7 +190,8 @@ function Mappings() //{{{
                     [["<silent>", "<Silent>"],  commands.OPTION_NOARG]
                 ],
                 literal: 1,
-                serial: function () {
+                serial: function ()
+                {
                     let noremap = this.name.indexOf("noremap") > -1;
                     return [
                         {
diff --git a/common/content/modes.js b/common/content/modes.js
index b016048b..0159dd24 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -125,7 +125,7 @@ const modes = (function () //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var self = {
-        NONE:             0,
+        NONE: 0,
 
         __iterator__: function () util.Array.iterator(this.all),
 
@@ -133,7 +133,8 @@ const modes = (function () //{{{
 
         get inputMode() main & (this.COMMAND_LINE | this.INPUT | this.TEXTAREA | this.COMPOSE),
 
-        addMode: function (name, extended, display) {
+        addMode: function (name, extended, display)
+        {
             let disp = name.replace("_", " ", "g");
             this[name] = 1 << lastMode++;
             modeMap[name] = modeMap[this[name]] = {
diff --git a/common/content/style.js b/common/content/style.js
index ea4b5533..ca9f0f1c 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -504,7 +504,8 @@ liberator.registerObserver("load_commands", function ()
         },
         {
             bang: true,
-            completer: function (context, args) {
+            completer: function (context, args)
+            {
                 let compl = [];
                 if (args.completeArg == 0)
                 {
@@ -541,7 +542,8 @@ liberator.registerObserver("load_commands", function ()
 
     commands.add(["dels[tyle]"],
         "Remove a user stylesheet",
-        function (args) {
+        function (args)
+        {
             styles.removeSheet(args["-name"], args[0], args.literalArg, args["-index"], false);
         },
         {

From 83dc3857e901d26edf32de150e9eadb8ccbf1df4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 19:12:55 +1100
Subject: [PATCH 011/143] whitespace fix

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

diff --git a/common/content/events.js b/common/content/events.js
index 401244ba..0007de2f 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -242,8 +242,8 @@ function AutoCommands() //{{{
             liberator.echomsg("Executing " + event + " Auto commands for \"*\"", 8);
 
             let lastPattern = null;
-
             let url = args.url || "";
+
             for (let [,autoCmd] in Iterator(autoCmds))
             {
                 if (autoCmd.pattern.test(url))
@@ -252,22 +252,24 @@ function AutoCommands() //{{{
                         liberator.echomsg("Executing " + event + " Auto commands for \"" + autoCmd.pattern.source + "\"", 8);
 
                     lastPattern = autoCmd.pattern;
-
                     liberator.echomsg("autocommand " + autoCmd.command, 9);
+
                     if (typeof autoCmd.command == "function")
                     {
                         try
                         {
                             autoCmd.command.call(autoCmd, args);
                         }
-                        catch(e)
+                        catch (e)
                         {
                             liberator.reportError(e);
                             liberator.echoerr(e);
                         }
                     }
                     else
+                    {
                         liberator.execute(commands.replaceTokens(autoCmd.command, args));
+                    }
                 }
             }
         }

From 35d1a756d860fd0e290c5d9b35829060685b24f4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 19:13:34 +1100
Subject: [PATCH 012/143] prefer let over var in liberator

---
 common/content/liberator.js | 85 +++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 242fde11..d11147c1 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -71,7 +71,7 @@ const liberator = (function () //{{{
     let nError = 0;
     function loadModule(name, func)
     {
-        var message = "Loading module " + name + "...";
+        let message = "Loading module " + name + "...";
         try
         {
             liberator.log(message, 0);
@@ -228,21 +228,23 @@ const liberator = (function () //{{{
             "Open a " + config.name + " dialog",
             function (args)
             {
-                args = args[0];
+                let arg = args[0];
 
                 try
                 {
-                    var dialogs = config.dialogs;
+                    let dialogs = config.dialogs;
+
                     for (let i = 0; i < dialogs.length; i++)
                     {
-                        if (dialogs[i][0] == args)
+                        if (dialogs[i][0] == arg)
                             return dialogs[i][2]();
                     }
-                    liberator.echoerr(args ? "Dialog " + args.quote() + " not available" : "E474: Invalid argument");
+
+                    liberator.echoerr("E475: Invalid argument: " + arg);
                 }
                 catch (e)
                 {
-                    liberator.echoerr("Error opening '" + args + "': " + e);
+                    liberator.echoerr("Error opening '" + arg + "': " + e);
                 }
             },
             {
@@ -321,7 +323,7 @@ const liberator = (function () //{{{
             {
                 try
                 {
-                    var cmd = liberator.eval(args.string);
+                    let cmd = liberator.eval(args.string);
                     liberator.execute(cmd);
                 }
                 catch (e)
@@ -491,13 +493,13 @@ const liberator = (function () //{{{
                     }
                     else
                     {
-                        var beforeTime = Date.now();
+                        let beforeTime = Date.now();
                         method();
 
                         if (special)
                             return;
 
-                        var afterTime = Date.now();
+                        let afterTime = Date.now();
 
                         if (afterTime - beforeTime >= 100)
                             liberator.echo("Total time: " + ((afterTime - beforeTime) / 1000.0).toFixed(2) + " sec");
@@ -551,7 +553,7 @@ const liberator = (function () //{{{
     // similar in his config
     function hideGUI()
     {
-        var guioptions = config.guioptions;
+        let guioptions = config.guioptions;
         for (let option in guioptions)
         {
             guioptions[option].forEach(function (elem) {
@@ -629,7 +631,7 @@ const liberator = (function () //{{{
             // liberator.dump("type: " + type + " mode: " + mode + "data: " + data + "\n");
             for (let i = 0; i < callbacks.length; i++)
             {
-                var [thistype, thismode, thisfunc] = callbacks[i];
+                let [thistype, thismode, thisfunc] = callbacks[i];
                 if (mode == thismode && type == thistype)
                     return thisfunc.call(this, data);
             }
@@ -803,19 +805,24 @@ const liberator = (function () //{{{
         evalExpression: function (string)
         {
             string = string.toString().replace(/^\s*/, "").replace(/\s*$/, "");
-            var matches = string.match(/^&(\w+)/);
+            let matches = string.match(/^&(\w+)/);
+
             if (matches)
             {
-                var opt = this.options.get(matches[1]);
+                let opt = this.options.get(matches[1]);
+
                 if (!opt)
                 {
                     this.echoerr("E113: Unknown option: " + matches[1]);
                     return;
                 }
-                var type = opt.type;
-                var value = opt.getter();
+
+                let type = opt.type;
+                let value = opt.getter();
+
                 if (type != "boolean" && type != "number")
                     value = value.toString();
+
                 return value;
             }
 
@@ -823,7 +830,9 @@ const liberator = (function () //{{{
             else if (matches = string.match(/^(['"])([^\1]*?[^\\]?)\1/))
             {
                 if (matches)
+                {
                     return matches[2].toString();
+                }
                 else
                 {
                     this.echoerr("E115: Missing quote: " + string);
@@ -837,7 +846,8 @@ const liberator = (function () //{{{
                 return parseInt(match[1], 10);
             }
 
-            var reference = this.variableReference(string);
+            let reference = this.variableReference(string);
+
             if (!reference[0])
                 this.echoerr("E121: Undefined variable: " + string);
             else
@@ -929,12 +939,12 @@ const liberator = (function () //{{{
 
         help: function (topic)
         {
-            var where = (options["newtab"] && options.get("newtab").has("all", "help"))
+            let where = (options["newtab"] && options.get("newtab").has("all", "help"))
                             ? liberator.NEW_TAB : liberator.CURRENT_TAB;
 
             if (!topic)
             {
-                var helpFile = options["helpfile"];
+                let helpFile = options["helpfile"];
 
                 if (config.helpFiles.indexOf(helpFile) != -1)
                     liberator.open("chrome://liberator/locale/" + helpFile, where);
@@ -957,8 +967,8 @@ const liberator = (function () //{{{
                 }, 500);
             }
 
-            var items = completion.runCompleter("help", topic);
-            var partialMatch = -1;
+            let items = completion.runCompleter("help", topic);
+            let partialMatch = -1;
 
             for (let [i, item] in Iterator(items))
             {
@@ -1032,8 +1042,8 @@ const liberator = (function () //{{{
         // TODO: add proper level constants
         log: function (msg, level)
         {
-            var verbose = 0;
-            if (typeof level != "number") // XXX
+            let verbose = 0;
+            if (level == undefined)
                 level = 1;
 
             // options does not exist at the very beginning
@@ -1046,7 +1056,7 @@ const liberator = (function () //{{{
             if (typeof msg == "object")
                 msg = util.objectToString(msg, false);
 
-            var consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
+            const consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
             consoleService.logStringMessage(config.name.toLowerCase() + ": " + msg);
         },
 
@@ -1183,8 +1193,8 @@ const liberator = (function () //{{{
             const nsIAppStartup = Ci.nsIAppStartup;
 
             // notify all windows that an application quit has been requested.
-            var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-            var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
+            const os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+            const cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
             os.notifyObservers(cancelQuit, "quit-application-requested", null);
 
             // something aborted the quit process.
@@ -1195,17 +1205,16 @@ const liberator = (function () //{{{
             os.notifyObservers(null, "quit-application-granted", null);
 
             // enumerate all windows and call shutdown handlers
-            var wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
-            var windows = wm.getEnumerator(null);
+            const wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
+            let windows = wm.getEnumerator(null);
             while (windows.hasMoreElements())
             {
-                var win = windows.getNext();
+                let win = windows.getNext();
                 if (("tryToClose" in win) && !win.tryToClose())
                     return;
             }
-            Cc["@mozilla.org/toolkit/app-startup;1"]
-                      .getService(nsIAppStartup)
-                      .quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit);
+            Cc["@mozilla.org/toolkit/app-startup;1"].getService(nsIAppStartup)
+                .quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit);
         },
 
         // TODO: move to {muttator,vimperator,...}.js
@@ -1357,7 +1366,7 @@ const liberator = (function () //{{{
             if (!string)
                 return [null, null, null];
 
-            var matches = string.match(/^([bwtglsv]):(\w+)/);
+            let matches = string.match(/^([bwtglsv]):(\w+)/);
             if (matches) // Variable
             {
                 // Other variables should be implemented
@@ -1380,12 +1389,14 @@ const liberator = (function () //{{{
 
         get windows()
         {
-            var wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
-            var wa = [];
-            var enumerator = wm.getEnumerator("navigator:browser");
+            const wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
+            let windows = [];
+            let enumerator = wm.getEnumerator("navigator:browser");
+
             while (enumerator.hasMoreElements())
-                wa.push(enumerator.getNext());
-            return wa;
+                windows.push(enumerator.getNext());
+
+            return windows;
         }
     };
     //}}}

From 67e5788fd56ba58c103e401f813f2ea4d7ba0948 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 19:14:38 +1100
Subject: [PATCH 013/143] prefer let over var in Hints

---
 common/content/hints.js | 58 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/common/content/hints.js b/common/content/hints.js
index 55e8f043..25803f34 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -107,19 +107,19 @@ function Hints() //{{{
         if (!win)
             win = window.content;
 
-        var doc = win.document;
-        var height = win.innerHeight;
-        var width  = win.innerWidth;
-        var scrollX = doc.defaultView.scrollX;
-        var scrollY = doc.defaultView.scrollY;
+        let doc = win.document;
+        let height = win.innerHeight;
+        let width  = win.innerWidth;
+        let scrollX = doc.defaultView.scrollX;
+        let scrollY = doc.defaultView.scrollY;
 
-        var baseNodeAbsolute = util.xmlToDom(<span highlight="Hint"/>, doc);
+        let baseNodeAbsolute = util.xmlToDom(<span highlight="Hint"/>, doc);
 
-        var elem, tagname, text, span, rect;
-        var res = buffer.evaluateXPath(hintMode.tags(), doc, null, true);
+        let elem, tagname, text, span, rect;
+        let res = buffer.evaluateXPath(hintMode.tags(), doc, null, true);
 
-        var fragment = util.xmlToDom(<div highlight="hints"/>, doc);
-        var start = pageHints.length;
+        let fragment = util.xmlToDom(<div highlight="hints"/>, doc);
+        let start = pageHints.length;
         for (let elem in res)
         {
             // TODO: for iframes, this calculation is wrong
@@ -131,7 +131,7 @@ function Hints() //{{{
             if (!rect)
                 continue;
 
-            var computedStyle = doc.defaultView.getComputedStyle(elem, null);
+            let computedStyle = doc.defaultView.getComputedStyle(elem, null);
             if (computedStyle.getPropertyValue("visibility") != "visible" || computedStyle.getPropertyValue("display") == "none")
                 continue;
 
@@ -171,11 +171,11 @@ function Hints() //{{{
     // TODO: make it aware of imgspans
     function showActiveHint(newID, oldID)
     {
-        var oldElem = validHints[oldID - 1];
+        let oldElem = validHints[oldID - 1];
         if (oldElem)
             setClass(oldElem, false);
 
-        var newElem = validHints[newID - 1];
+        let newElem = validHints[newID - 1];
         if (newElem)
             setClass(newElem, true);
     }
@@ -274,7 +274,7 @@ function Hints() //{{{
 
     function removeHints(timeout)
     {
-        var firstElem = validHints[0] || null;
+        let firstElem = validHints[0] || null;
 
         for (let [,{ doc: doc, start: start, end: end }] in Iterator(docs))
         {
@@ -329,9 +329,9 @@ function Hints() //{{{
             }
         }
 
-        var timeout = followFirst || events.feedingKeys ? 0 : 500;
-        var activeIndex = (hintNumber ? hintNumber - 1 : 0);
-        var elem = validHints[activeIndex];
+        let timeout = followFirst || events.feedingKeys ? 0 : 500;
+        let activeIndex = (hintNumber ? hintNumber - 1 : 0);
+        let elem = validHints[activeIndex];
         removeHints(timeout);
 
         if (timeout == 0)
@@ -369,7 +369,7 @@ function Hints() //{{{
         function tokenize(pat, string) string.split(pat).map(String.toLowerCase);
         function containsMatcher(hintString) //{{{
         {
-            var tokens = tokenize(/\s+/, hintString);
+            let tokens = tokenize(/\s+/, hintString);
             return function (linkText)
             {
                 linkText = linkText.toLowerCase();
@@ -379,14 +379,14 @@ function Hints() //{{{
 
         function wordStartsWithMatcher(hintString, allowWordOverleaping) //{{{
         {
-            var hintStrings    = tokenize(/\s+/, hintString);
-            var wordSplitRegex = RegExp(options["wordseparators"]);
+            let hintStrings    = tokenize(/\s+/, hintString);
+            let wordSplitRegex = RegExp(options["wordseparators"]);
 
             // What the **** does this do? --Kris
             function charsAtBeginningOfWords(chars, words, allowWordOverleaping)
             {
-                var charIdx         = 0;
-                var numMatchedWords = 0;
+                let charIdx         = 0;
+                let numMatchedWords = 0;
                 for (let [,word] in Iterator(words))
                 {
                     if (word.length == 0)
@@ -414,7 +414,7 @@ function Hints() //{{{
                     }
 
                     // the current word matches same characters as the previous word
-                    var prevCharIdx;
+                    let prevCharIdx;
                     if (wcIdx > 0)
                     {
                         prevCharIdx = charIdx;
@@ -468,7 +468,7 @@ function Hints() //{{{
 
             function stringsAtBeginningOfWords(strings, words, allowWordOverleaping)
             {
-                var strIdx = 0;
+                let strIdx = 0;
                 for (let [,word] in Iterator(words))
                 {
                     if (word.length == 0)
@@ -505,7 +505,7 @@ function Hints() //{{{
             }
         } //}}}
 
-        var hintMatching = options["hintmatching"];
+        let hintMatching = options["hintmatching"];
         switch (hintMatching)
         {
             case "contains"      : return containsMatcher(hintString);
@@ -655,8 +655,8 @@ function Hints() //{{{
 
         onEvent: function (event)
         {
-            var key = events.toString(event);
-            var followFirst = false;
+            let key = events.toString(event);
+            let followFirst = false;
 
             // clear any timeout which might be active after pressing a number
             if (activeTimeout)
@@ -677,7 +677,7 @@ function Hints() //{{{
                     if (hintNumber == 0)
                         hintNumber = 1;
 
-                    var oldID = hintNumber;
+                    let oldID = hintNumber;
                     if (key == "<Tab>")
                     {
                         if (++hintNumber > validHints.length)
@@ -721,7 +721,7 @@ function Hints() //{{{
                     {
                         prevInput = "number";
 
-                        var oldHintNumber = hintNumber;
+                        let oldHintNumber = hintNumber;
                         if (hintNumber == 0 || usedTabKey)
                         {
                             usedTabKey = false;

From 01a7ead528502b2f1245b22a35d5d3e3627dcaab Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 23:00:14 +1100
Subject: [PATCH 014/143] add missing semicolons

---
 common/content/commands.js          |  8 ++++----
 common/content/editor.js            |  2 +-
 common/content/eval.js              |  2 +-
 common/content/events.js            |  4 ++--
 common/content/find.js              |  2 +-
 common/content/hints.js             | 10 +++++-----
 common/content/io.js                |  2 +-
 common/content/liberator-overlay.js |  2 +-
 common/content/liberator.js         |  2 +-
 common/content/options.js           |  6 +++---
 common/content/style.js             | 20 ++++++++++----------
 common/content/tabs.js              |  2 +-
 vimperator/content/bookmarks.js     | 18 ++++++++++++------
 vimperator/content/config.js        |  2 +-
 14 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/common/content/commands.js b/common/content/commands.js
index 73beca92..75711744 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -120,7 +120,7 @@ Command.prototype = {
             if (matches && matches[2])
             {
                 commandline.inputMultiline(new RegExp("^" + matches[2] + "$", "m"),
-                    function (args) { exec(matches[1] + "\n" + args) });
+                    function (args) { exec(matches[1] + "\n" + args); });
                 return;
             }
         }
@@ -169,7 +169,7 @@ function Commands() //{{{
     const quoteMap = {
         "\n": "n",
         "\t": "t"
-    }
+    };
     function quote(q, list)
     {
         let re = RegExp("[" + list + "]", "g");
@@ -184,7 +184,7 @@ function Commands() //{{{
         '"': quote('"', '\n\t"\\\\'),
         "'": quote("'", "\\\\'"),
         "":  quote("",  "\\\\ ")
-    }
+    };
 
     const ArgType = new Struct("description", "parse");
     const argTypes = [
@@ -555,7 +555,7 @@ function Commands() //{{{
                 if (complete)
                 {
                     if (argCount == "0" || args.length > 0  && (/[1?]/.test(argCount)))
-                        complete.highlight(i, sub.length, "SPELLCHECK")
+                        complete.highlight(i, sub.length, "SPELLCHECK");
                 }
 
                 if (args.length == literal)
diff --git a/common/content/editor.js b/common/content/editor.js
index be1b3aba..6219a4ea 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -857,7 +857,7 @@ function Editor() //{{{
                         editor.selection.deleteFromDocument();
                         editor.insertText(val);
                     }
-                }, this)
+                }, this);
                 if (res == false)
                     throw "Couldn't create temporary file";
             }
diff --git a/common/content/eval.js b/common/content/eval.js
index 14f5fd95..daf0dba6 100644
--- a/common/content/eval.js
+++ b/common/content/eval.js
@@ -1,4 +1,4 @@
-try { __liberator_eval_result = eval(__liberator_eval_string)
+try { __liberator_eval_result = eval(__liberator_eval_string);
 }
 catch (e)
 {
diff --git a/common/content/events.js b/common/content/events.js
index 0007de2f..4c1d9f8c 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -689,7 +689,7 @@ function Events() //{{{
 
     commands.add(["macros"],
         "List all macros",
-        function (args) { completion.listCompleter("macro", args[0]) },
+        function (args) { completion.listCompleter("macro", args[0]); },
         {
             argCount: "?",
             completer: function (context) completion.macro(context)
@@ -1283,7 +1283,7 @@ function Events() //{{{
                 {
                     events.feedingKeys = false;
                     if (lastMacro)
-                        setTimeout(function () { liberator.echomsg("Canceled playback of macro '" + lastMacro + "'") }, 100);
+                        setTimeout(function () { liberator.echomsg("Canceled playback of macro '" + lastMacro + "'"); }, 100);
                     event.preventDefault();
                     event.stopPropagation();
                     return true;
diff --git a/common/content/find.js b/common/content/find.js
index 794476ac..41b15599 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -176,7 +176,7 @@ function Search() //{{{
                 return;
             }
 
-            var baseNode = <span highlight="Search"/>
+            var baseNode = <span highlight="Search"/>;
             baseNode = util.xmlToDom(baseNode, window.content.document);
 
             var body = doc.body;
diff --git a/common/content/hints.js b/common/content/hints.js
index 25803f34..90c7e14f 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -237,7 +237,7 @@ function Hints() //{{{
                         hint[IMGSPAN] = imgspan;
                         span.parentNode.appendChild(imgspan);
                     }
-                    setClass(imgspan, activeHint == hintnum)
+                    setClass(imgspan, activeHint == hintnum);
                 }
 
                 span.setAttribute("number", hintnum);
@@ -289,7 +289,7 @@ function Hints() //{{{
 
             // animate the disappearance of the first hint
             if (timeout && firstElem)
-                setTimeout(function () { firstElem.removeAttributeNS(NS.uri, "highlight") }, timeout);
+                setTimeout(function () { firstElem.removeAttributeNS(NS.uri, "highlight"); }, timeout);
         }
         styles.removeSheet("hint-positions", null, null, null, true);
 
@@ -374,7 +374,7 @@ function Hints() //{{{
             {
                 linkText = linkText.toLowerCase();
                 return tokens.every(function (token) linkText.indexOf(token) >= 0);
-            }
+            };
         } //}}}
 
         function wordStartsWithMatcher(hintString, allowWordOverleaping) //{{{
@@ -502,7 +502,7 @@ function Hints() //{{{
                     return charsAtBeginningOfWords(hintStrings[0], words, allowWordOverleaping);
                 else
                     return stringsAtBeginningOfWords(hintStrings, words, allowWordOverleaping);
-            }
+            };
         } //}}}
 
         let hintMatching = options["hintmatching"];
@@ -584,7 +584,7 @@ function Hints() //{{{
         function (count)
         {
             extendedhintCount = count;
-            commandline.input(";", function (arg) { setTimeout(function () hints.show(arg), 0) },
+            commandline.input(";", function (arg) { setTimeout(function () hints.show(arg), 0); },
                 {
                     promptHighlight: "Normal",
                     completer: function (context)
diff --git a/common/content/io.js b/common/content/io.js
index fd111d52..8a5e3d97 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -30,7 +30,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 plugins.contexts = {};
 function Script(file)
 {
-    let self = plugins.contexts[file.path]
+    let self = plugins.contexts[file.path];
     if (self)
     {
         if (self.onUnload)
diff --git a/common/content/liberator-overlay.js b/common/content/liberator-overlay.js
index 288559e2..9b0df22b 100644
--- a/common/content/liberator-overlay.js
+++ b/common/content/liberator-overlay.js
@@ -13,7 +13,7 @@
         {
             try
             {
-                loader.loadSubScript(base + script, modules)
+                loader.loadSubScript(base + script, modules);
                 return;
             }
             catch (e)
diff --git a/common/content/liberator.js b/common/content/liberator.js
index d11147c1..1e3d7037 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -109,7 +109,7 @@ const liberator = (function () //{{{
                            .forEach(function (elem)
                         {
                             if (elem)
-                                elem.collapsed = (opts.indexOf(opt) == -1)
+                                elem.collapsed = (opts.indexOf(opt) == -1);
                         });
                     }
                 }
diff --git a/common/content/options.js b/common/content/options.js
index 460490bb..6373dcb6 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -73,7 +73,7 @@ function Option(names, description, type, defaultValue, extraInfo) //{{{
 }
 Option.prototype = {
     get globalvalue() options.store.get(this.name),
-    set globalvalue(val) { options.store.set(this.name, val) },
+    set globalvalue(val) { options.store.set(this.name, val); },
 
     parseValues: function (value)
     {
@@ -164,8 +164,8 @@ Option.prototype = {
         if (this.checkHas)
             test = function (val) values.some(function (value) self.checkHas(value, val));
         let values = this.values;
-        /* Return whether some argument matches */
-        return Array.some(arguments, function (val) test(val))
+        // return whether some argument matches
+        return Array.some(arguments, function (val) test(val));
     },
 
     hasName: function (name) this.names.indexOf(name) >= 0,
diff --git a/common/content/style.js b/common/content/style.js
index ca9f0f1c..62c14ef2 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -166,7 +166,7 @@ function Highlights(name, store, serial)
             return error;
         style.value = newStyle;
         highlight[style.class] = style;
-    }
+    };
 
     this.selector = function (class)
     {
@@ -200,7 +200,7 @@ function Highlights(name, store, serial)
             if (hl.value == hl.default)
                 this.set(class);
         }
-    }
+    };
 }
 
 function Styles(name, store, serial)
@@ -264,7 +264,7 @@ function Styles(name, store, serial)
             names[name] = sheet;
         }
         return null;
-    }
+    };
 
     this.findSheets = function (name, filter, css, index, system)
     {
@@ -324,7 +324,7 @@ function Styles(name, store, serial)
             }
         }
         return matches.length;
-    }
+    };
 
     this.registerSheet = function (uri, doCheckSyntax, reload)
     {
@@ -336,14 +336,14 @@ function Styles(name, store, serial)
         uri = ios.newURI(uri, null, null);
         if (reload || !sss.sheetRegistered(uri, sss.USER_SHEET))
             sss.loadAndRegisterSheet(uri, sss.USER_SHEET);
-    }
+    };
 
     this.unregisterSheet = function (uri)
     {
         uri = ios.newURI(uri, null, null);
         if (sss.sheetRegistered(uri, sss.USER_SHEET))
             sss.unregisterSheet(uri, sss.USER_SHEET);
-    }
+    };
 
     // FIXME
     this.registerAgentSheet = function (uri)
@@ -351,14 +351,14 @@ function Styles(name, store, serial)
         this.unregisterAgentSheet(uri);
         uri = ios.newURI(uri, null, null);
         sss.loadAndRegisterSheet(uri, sss.AGENT_SHEET);
-    }
+    };
 
     this.unregisterAgentSheet = function (uri)
     {
         uri = ios.newURI(uri, null, null);
         if (sss.sheetRegistered(uri, sss.AGENT_SHEET))
             sss.unregisterSheet(uri, sss.AGENT_SHEET);
-    }
+    };
 
     function wrapCSS(sheet)
     {
@@ -425,7 +425,7 @@ function Styles(name, store, serial)
         if (errors.length)
         {
             let err = new Error("", errors[0].sourceName.replace(/^(chrome-data:text\/css,).*/, "$1..."), errors[0].lineNumber);
-            err.name = "CSSError"
+            err.name = "CSSError";
             err.message = errors.reduce(function (msg, e) msg + "; " + e.lineNumber + ": " + e.errorMessage,
                 errors.shift().errorMessage);
             err.echoerr = err.fileName + ":" + err.lineNumber + ": " + err.message;
@@ -516,7 +516,7 @@ liberator.registerObserver("load_commands", function ()
                     }
                     catch (e) {}
                     context.anchored = false;
-                    context.completions = compl.concat([[s, ""] for each (s in styles.sites)])
+                    context.completions = compl.concat([[s, ""] for each (s in styles.sites)]);
                 }
                 else if (args.completeArg == 1)
                 {
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 6fee2043..6cec525d 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -598,7 +598,7 @@ function Tabs() //{{{
             function (args)
             {
                 let count = args.count;
-                args = args[0]
+                args = args[0];
 
                 if (count < 1)
                     count = 1;
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index 9dd6e9b1..8acac9f7 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -238,7 +238,7 @@ function Bookmarks() //{{{
     var cache = storage.newObject("bookmark-cache", Cache, false);
     storage.addObserver("bookmark-cache", bookmarkObserver);
     liberator.registerObserver("shutdown", function () {
-        storage.removeObserver("bookmark-cache", bookmarkObserver)
+        storage.removeObserver("bookmark-cache", bookmarkObserver);
     });
 
     liberator.registerObserver("enter", function () {
@@ -358,7 +358,7 @@ function Bookmarks() //{{{
                 if (!args.bang)
                 {
                     context.completions = [[content.document.documentURI, "Current Location"]];
-                    return
+                    return;
                 }
                 completion.bookmark(context, args["-tags"], { keyword: args["-keyword"], title: args["-title"] });
             },
@@ -784,7 +784,7 @@ function History() //{{{
         function (args) { history.list(args.join(" "), args.bang, args["-max"] || 1000); },
         {
             bang: true,
-            completer: function (context) { context.quote = null, completion.history(context) },
+            completer: function (context) { context.quote = null, completion.history(context); },
             options: [[["-max", "-m"], options.OPTION_INT]]
             // completer: function (filter) completion.history(filter)
         });
@@ -823,7 +823,7 @@ function History() //{{{
                     url: node.uri,
                     title: node.title,
                     icon: node.icon ? node.icon.spec : DEFAULT_FAVICON
-                }
+                };
             });
             root.containerOpen = false; // close a container after using it!
 
@@ -844,7 +844,10 @@ function History() //{{{
         {
             let index = window.getWebNavigation().sessionHistory.index;
             if (index == 0)
-                return liberator.beep(); // really wanted?
+            {
+                liberator.beep(); // XXX: really wanted?
+                return;
+            }
 
             window.getWebNavigation().gotoIndex(0);
         },
@@ -853,7 +856,10 @@ function History() //{{{
         {
             let index = window.getWebNavigation().sessionHistory.index;
             if (index == window.getWebNavigation().sessionHistory.count - 1)
-                return liberator.beep();
+            {
+                liberator.beep();
+                return;
+            }
 
             window.getWebNavigation().gotoIndex(max);
         },
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index a11c8e2c..cc353a28 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -171,7 +171,7 @@ const config = { //{{{
                 </> + "}",
                 true);
             delete img;
-        }
+        };
 
         ////////////////////////////////////////////////////////////////////////////////
         ////////////////////// MAPPINGS ////////////////////////////////////////////////

From 98cc66c5695f5ab71176e4adffb3a248a2d25c96 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 23:09:37 +1100
Subject: [PATCH 015/143] remove some ancient cruft

---
 common/content/events.js | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 4c1d9f8c..c477cb80 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1339,25 +1339,7 @@ function Events() //{{{
                     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) +
-        //                               window.readFromClipboard() +
-        //                               command_line.value.substring(command_line.selectionEnd, command_line.value.length);
-        //         alert(command_line.value);
-        //      }
-        //      //else
-        // //       {
-        // //           openURLs(window.readFromClipboard());
-        // //       }
-        //      return true;
-        //  } }}}
+            // TODO: handle middle click in content area
 
             if (key != "<Esc>" && key != "<C-[>")
             {

From b08f9053b3c24b167e3ffcf1388a4d0e438a192e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 23:12:06 +1100
Subject: [PATCH 016/143] declare variable in getMenuItems#addChildren()

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

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 1e3d7037..30283ee6 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -268,7 +268,7 @@ const liberator = (function () //{{{
                     }
                     else
                     {
-                        path = parent;
+                        let path = parent;
                         if (item.localName == "menu")
                             path += item.label + ".";
                         addChildren(item, path);

From b2799ebeddd4e4a14b10958179123e1259d8ec63 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 23:17:52 +1100
Subject: [PATCH 017/143] minor refactoring of "b" action

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

diff --git a/common/content/tabs.js b/common/content/tabs.js
index 6cec525d..4e8512f2 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -252,8 +252,9 @@ function Tabs() //{{{
             function (count)
             {
                 if (count != -1)
-                    return tabs.switchTo(String(count));
-                commandline.open(":", "buffer! ", modes.EX);
+                    tabs.switchTo(String(count));
+                else
+                    commandline.open(":", "buffer! ", modes.EX);
             },
             { flags: Mappings.flags.COUNT });
 

From d277dd5c1cfe9ef2265fdd02af4341879268efb2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 23:24:31 +1100
Subject: [PATCH 018/143] minor refactoring of :dialog action

---
 common/content/liberator.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 30283ee6..2edaa653 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -232,12 +232,16 @@ const liberator = (function () //{{{
 
                 try
                 {
+                    // TODO: why are these sorts of properties arrays? --djk
                     let dialogs = config.dialogs;
 
-                    for (let i = 0; i < dialogs.length; i++)
+                    for (let [,dialog] in Iterator(dialogs))
                     {
-                        if (dialogs[i][0] == arg)
-                            return dialogs[i][2]();
+                        if (arg == dialog[0])
+                        {
+                            dialog[2]();
+                            return;
+                        }
                     }
 
                     liberator.echoerr("E475: Invalid argument: " + arg);

From 39d6542e80b6cd610c43209c68a16fad72207d7b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 23:50:12 +1100
Subject: [PATCH 019/143] minor refactoring of :command action

---
 common/content/commands.js | 42 ++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/common/content/commands.js b/common/content/commands.js
index 75711744..7486d344 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -759,19 +759,20 @@ function Commands() //{{{
                 {
                     if (/^custom,/.test(completeOpt))
                     {
+                        completeOpt = completeOpt.substr(7);
                         completeFunc = function ()
                         {
                             try
                             {
-                                var completer = liberator.eval(completeOpt.substr(7));
+                                var completer = liberator.eval(completeOpt);
 
                                 if (!(completer instanceof Function))
-                                    throw new TypeError("User-defined custom completer '" + completeOpt.substr(7) + "' is not a function");
+                                    throw new TypeError("User-defined custom completer '" + completeOpt + "' is not a function");
                             }
                             catch (e)
                             {
                                 // FIXME: should be pushed to the MOW
-                                liberator.echoerr("E117: Unknown function: " + completeOpt.substr(7));
+                                liberator.echoerr("E117: Unknown function: " + completeOpt);
                                 liberator.log(e);
                                 return undefined;
                             }
@@ -784,26 +785,23 @@ function Commands() //{{{
                     }
                 }
 
-                if (!commands.addUserCommand(
-                        [cmd],
-                        "User defined command",
-                        userCommand,
-                        {
-                            argCount: nargsOpt,
-                            bang: bangOpt,
-                            count: countOpt,
-                            completer: function (context, args)
-                            {
-                                if (completeFunc)
-                                    return completeFunc(context, args)
-                            },
-                            replacementText: args.literalArg
-                        },
-                        args.bang)
-                    )
-                {
+                let added = commands.addUserCommand([cmd],
+                                "User defined command",
+                                userCommand,
+                                {
+                                    argCount: nargsOpt,
+                                    bang: bangOpt,
+                                    count: countOpt,
+                                    completer: function (context, args)
+                                    {
+                                        if (completeFunc)
+                                            return completeFunc(context, args)
+                                    },
+                                    replacementText: args.literalArg
+                                }, args.bang);
+
+                if (!added)
                     liberator.echoerr("E174: Command already exists: add ! to replace it");
-                }
             }
             else
             {

From 89dc3c2078baeefd494f529cc4b11c40b40f6fbc Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 19 Dec 2008 23:59:25 +1100
Subject: [PATCH 020/143] trivial refactoring of :emenu and :chdir actions

---
 common/content/io.js        | 20 ++++++++++----------
 common/content/liberator.js |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/content/io.js b/common/content/io.js
index 8a5e3d97..136b2b13 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -194,17 +194,17 @@ function IO() //{{{
         "Change the current directory",
         function (args)
         {
-            args = args.literalArg;
+            let arg = args.literalArg;
 
-            if (!args)
+            if (!arg)
             {
-                args = "~";
+                arg = "~";
             }
-            else if (args == "-")
+            else if (arg == "-")
             {
                 if (oldcwd)
                 {
-                    args = oldcwd.path;
+                    arg = oldcwd.path;
                 }
                 else
                 {
@@ -213,14 +213,14 @@ function IO() //{{{
                 }
             }
 
-            args = io.expandPath(args);
+            arg = io.expandPath(arg);
 
             // go directly to an absolute path or look for a relative path
             // match in 'cdpath'
             // TODO: handle ../ and ./ paths
-            if (isAbsolutePath(args))
+            if (isAbsolutePath(arg))
             {
-                if (io.setCurrentDirectory(args))
+                if (io.setCurrentDirectory(arg))
                     liberator.echomsg(io.getCurrentDirectory().path);
             }
             else
@@ -230,7 +230,7 @@ function IO() //{{{
 
                 for (let [,dir] in Iterator(dirs))
                 {
-                    dir = joinPaths(dir, args);
+                    dir = joinPaths(dir, arg);
 
                     if (dir.exists() && dir.isDirectory() && dir.isReadable())
                     {
@@ -243,7 +243,7 @@ function IO() //{{{
 
                 if (!found)
                 {
-                    liberator.echoerr("E344: Can't find directory " + args.quote() + " in cdpath\n"
+                    liberator.echoerr("E344: Can't find directory " + arg.quote() + " in cdpath\n"
                                     + "E472: Command failed");
                 }
             }
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 2edaa653..e5c8cfa8 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -289,18 +289,18 @@ const liberator = (function () //{{{
             "Execute the specified menu item from the command line",
             function (args)
             {
-                args = args.literalArg;
+                let arg = args.literalArg;
                 let items = getMenuItems();
 
-                if (!items.some(function (i) i.fullMenuPath == args))
+                if (!items.some(function (i) i.fullMenuPath == arg))
                 {
-                    liberator.echoerr("E334: Menu not found: " + args);
+                    liberator.echoerr("E334: Menu not found: " + arg);
                     return;
                 }
 
                 for (let [,item] in Iterator(items))
                 {
-                    if (item.fullMenuPath == args)
+                    if (item.fullMenuPath == arg)
                         item.doCommand();
                 }
             },

From 9df54a457267d9f2c599cb9803f61fc87b83a460 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 20 Dec 2008 00:15:13 +1100
Subject: [PATCH 021/143] fix transposed defaults in showmode and shell help

---
 vimperator/locale/en-US/options.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 71056576..2d017a69 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -614,7 +614,7 @@ ____
 
 
 |\'shell'| |\'sh'|
-||'shell' 'sh'|| string (default: on)
+||'shell' 'sh'|| string (default: "-c", Win32: "/c")
 ____
 Shell to use for executing :! and :run commands.
 ____
@@ -630,7 +630,7 @@ ____
 
 
 |\'nosmd'| |\'noshowmode'| |\'smd'| |\'showmode'|
-||'showmode' 'smd'|| boolean (default: "-c", Win32: "/c")
+||'showmode' 'smd'|| boolean (default: on)
 ____
 Show the current mode in the command-line.
 ____

From abf6bafaf7272415b7ca16ebd8c4347d14a21f82 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 20 Dec 2008 00:31:13 +1100
Subject: [PATCH 022/143] fix search highlighting when 'incsearch' is set -
 Algardas <algardas@gmail.com>

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

diff --git a/common/content/find.js b/common/content/find.js
index 41b15599..923426f5 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -408,11 +408,10 @@ function Search() //{{{
             if (!command)
                 command = lastSearchPattern;
 
+            this.clear();
+
             if (!options["incsearch"] || !found)
-            {
-                this.clear();
                 this.find(command, backwards);
-            }
 
             lastSearchBackwards = backwards;
             //lastSearchPattern = command.replace(backwards ? /\?.*/ : /\/.*/, ""); // XXX

From 6e9262ef6472b1aa2c2ce2c278d2f28e47680a6b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 20 Dec 2008 01:08:24 +1100
Subject: [PATCH 023/143] document :hardcopy >{filename}...since it was
 committed

---
 common/content/buffer.js          | 18 +++++++++++-------
 vimperator/NEWS                   |  1 +
 vimperator/locale/en-US/print.txt |  6 ++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 7527f7ad..0843ecb6 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -468,14 +468,18 @@ function Buffer() //{{{
         "Print current document",
         function (args)
         {
+            let arg = args[0];
+
+            // FIXME: arg handling is a bit of a mess, check for filename
+            if (arg && (liberator.has("Win32") || arg[0] != ">"))
+                return liberator.echoerr("E488: Trailing characters");
+
             options.temporaryContext(function () {
-                if (args[0])
+                if (arg)
                 {
-                    if (args[0][0] != ">")
-                        return liberator.echoerr("E488: Trailing characters");
                     options.setPref("print.print_to_file", "true");
-                    options.setPref("print.print_to_filename", io.getFile(args[0].substr(1)).path);
-                    liberator.echomsg("Printing to file: " + args[0].substr(1));
+                    options.setPref("print.print_to_filename", io.getFile(arg.substr(1)).path);
+                    liberator.echomsg("Printing to file: " + arg.substr(1));
                 }
                 else
                 {
@@ -488,8 +492,8 @@ function Buffer() //{{{
                 getBrowser().contentWindow.print();
             });
 
-            if (args[0])
-                liberator.echomsg("Printed: " + args[0].substr(1));
+            if (arg)
+                liberator.echomsg("Printed: " + arg.substr(1));
             else
                 liberator.echomsg("Print job sent.");
         },
diff --git a/vimperator/NEWS b/vimperator/NEWS
index c850ec2b..f982feda 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -21,6 +21,7 @@
       VimperatorLeave respectively
     * IMPORTANT: 'verbose' is now by default at 1, set to 0 to not show any status messages
 
+    * :hardcopy now supports output redirection to a file on Unix and MacUnix
     * add ";f" extended hint mode to focus a frame
     * add "r", "l", and "b" to 'guioptions' to toggle the scrollbars.
     * remove spaces and newlines when open urls starting with http:// or similar
diff --git a/vimperator/locale/en-US/print.txt b/vimperator/locale/en-US/print.txt
index aad69e18..397f9dbb 100644
--- a/vimperator/locale/en-US/print.txt
+++ b/vimperator/locale/en-US/print.txt
@@ -10,6 +10,12 @@ number of copies, orientation, etc.  When used with [!], the dialog is skipped
 and the default printer used.
 ________________________________________________________________________________
 
+
+||:ha[rdcopy][!] >{filename}|| +
+________________________________________________________________________________
+As above, but write the output to {filename}.
+________________________________________________________________________________
+
 section:Firefox{nbsp}printing{nbsp}dialogs[firefox-print-dialogs]
 
 The "Print Preview" and "Page Setup" dialogs can be opened via the :dialog command

From 073383ef1225e5429f68f8dd11dd11c3b740e165 Mon Sep 17 00:00:00 2001
From: Ted Pavlic <ted@tedpavlic.com>
Date: Fri, 19 Dec 2008 10:49:56 -0500
Subject: [PATCH 024/143] Allow empty defsearch.

---
 common/content/completion.js        | 2 +-
 vimperator/content/bookmarks.js     | 7 +++++++
 vimperator/locale/en-US/options.txt | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index f9ddee03..f7594214 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1645,7 +1645,7 @@ function Completion() //{{{
             let engines = bookmarks.getSearchEngines();
 
             context.title = ["Search Keywords"];
-            context.completions = keywords.concat(engines);
+            context.completions = [ bookmarks.makeKeyword("", "No default search engine", null, "") ].concat( keywords.concat(engines) );
             context.keys = { text: 0, description: 1, icon: 2 };
 
             if (!space || noSuggest)
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index 8acac9f7..e887a580 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -589,6 +589,13 @@ function Bookmarks() //{{{
                 return process(resp);
         },
 
+        // Allows for creation of anonymous keyword (e.g., for empty
+        // defsearch's)
+        makeKeyword: function makeKeyword(keyword, title, icon, url)
+        {
+            return new Keyword( keyword, title, icon, url );
+        },
+
         // TODO: add filtering
         // format of returned array:
         // [keyword, helptext, url]
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 2d017a69..22cdd8c7 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -247,6 +247,9 @@ This means, it you set 'defsearch' to "youtube", then [c]:open arnold
 schwarzenegger[c] will be exactly the same as [c]:open youtube arnold
 schwarzenegger[c]. Therefore, you need to add a keyword or search engine
 "youtube" first.
+
+If 'defsearch' is empty, then Firefox will always attempt to open the
+raw [[arg]].
 ____
 
 

From da5db4429e7a68c8c49614350bcec2a674d17e38 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 12:29:13 -0500
Subject: [PATCH 025/143] Revert "Allow empty defsearch."

This reverts commit 3cab7c16a0ef5e39f9aeeb8ea1ed9602a6a152f4.
---
 common/content/completion.js        | 2 +-
 vimperator/content/bookmarks.js     | 7 -------
 vimperator/locale/en-US/options.txt | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index f7594214..f9ddee03 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1645,7 +1645,7 @@ function Completion() //{{{
             let engines = bookmarks.getSearchEngines();
 
             context.title = ["Search Keywords"];
-            context.completions = [ bookmarks.makeKeyword("", "No default search engine", null, "") ].concat( keywords.concat(engines) );
+            context.completions = keywords.concat(engines);
             context.keys = { text: 0, description: 1, icon: 2 };
 
             if (!space || noSuggest)
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index e887a580..8acac9f7 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -589,13 +589,6 @@ function Bookmarks() //{{{
                 return process(resp);
         },
 
-        // Allows for creation of anonymous keyword (e.g., for empty
-        // defsearch's)
-        makeKeyword: function makeKeyword(keyword, title, icon, url)
-        {
-            return new Keyword( keyword, title, icon, url );
-        },
-
         // TODO: add filtering
         // format of returned array:
         // [keyword, helptext, url]
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 22cdd8c7..2d017a69 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -247,9 +247,6 @@ This means, it you set 'defsearch' to "youtube", then [c]:open arnold
 schwarzenegger[c] will be exactly the same as [c]:open youtube arnold
 schwarzenegger[c]. Therefore, you need to add a keyword or search engine
 "youtube" first.
-
-If 'defsearch' is empty, then Firefox will always attempt to open the
-raw [[arg]].
 ____
 
 

From 669043da71e53298932eecd8978b9b1dca2a065c Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 12:33:22 -0500
Subject: [PATCH 026/143] Add completion for empty 'defsearch'

---
 vimperator/content/bookmarks.js     | 6 +++++-
 vimperator/locale/en-US/options.txt | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index 8acac9f7..afb276e4 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -258,7 +258,11 @@ function Bookmarks() //{{{
         "Set the default search engine",
         "string", "google",
         {
-            completer: function completer(context) completion.search(context, true),
+            completer: function completer(context)
+            {
+                completion.search(context, true)
+                context.completions = [["", "Don't perform searches by default"]].concat(context.completions);
+            },
             validator: Option.validateCompleter
         });
 
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 2d017a69..22cdd8c7 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -247,6 +247,9 @@ This means, it you set 'defsearch' to "youtube", then [c]:open arnold
 schwarzenegger[c] will be exactly the same as [c]:open youtube arnold
 schwarzenegger[c]. Therefore, you need to add a keyword or search engine
 "youtube" first.
+
+If 'defsearch' is empty, then Firefox will always attempt to open the
+raw [[arg]].
 ____
 
 

From 057d66ce65f4bd9037960986a42d0993e791398f Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 13:27:01 -0500
Subject: [PATCH 027/143] Document some more crap.

---
 common/content/buffer.js     | 152 ++++++++++++++++++++++++++++++----
 common/content/commands.js   |   5 ++
 common/content/completion.js |   5 ++
 common/content/editor.js     |   5 ++
 common/content/events.js     |   8 ++
 common/content/find.js       |   5 ++
 common/content/hints.js      |   5 ++
 common/content/io.js         |   7 +-
 common/content/liberator.js  |   2 +
 common/content/mappings.js   |   5 ++
 common/content/modes.js      |   2 +
 common/content/options.js    |   5 ++
 common/content/style.js      | 155 ++++++++++++++++++++---------------
 common/content/tabs.js       |   2 +
 common/content/template.js   |   3 +
 common/content/ui.js         |   2 +
 common/content/util.js       |   2 +
 17 files changed, 285 insertions(+), 85 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 0843ecb6..81b75a68 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -26,8 +26,16 @@ 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 *****/
 
+/** @scope modules */
+
 const Point = new Struct("x", "y");
 
+/**
+ * A class to manage the primary web content buffer. The name comes
+ * from vim's term, 'buffer', which signifies instances of open
+ * files.
+ * @instance buffer
+ */
 function Buffer() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
@@ -809,6 +817,10 @@ function Buffer() //{{{
 
     return {
 
+        /**
+         * The alternative stylesheets for the current buffer. Only
+         * returns stylesheets for the 'screen' media type.
+         */
         get alternateStyleSheets()
         {
             let stylesheets = window.getAllStyleSheets(window.content);
@@ -818,9 +830,18 @@ function Buffer() //{{{
             );
         },
 
+        /**
+         * @property {Object} A map of page info sections to their
+         *     content generating functions.
+         */
         get pageInfo() pageInfo,
 
-        // 0 if loading, 1 if loaded or 2 if load failed
+        /**
+         * Returns whether the buffer is loaded. Values may be:
+         *   0 - Loading.
+         *   1 - Fully loaded.
+         *   2 - Load failed.
+         */
         get loaded()
         {
             if (window.content.document.pageIsFullyLoaded !== undefined)
@@ -833,7 +854,10 @@ function Buffer() //{{{
             window.content.document.pageIsFullyLoaded = value;
         },
 
-        // used to keep track of the right field for "gi"
+        /**
+         * The last focused input field in the buffer. Used by the
+         * "gi" key binding.
+         */
         get lastInputField()
         {
             if (window.content.document.lastInputField)
@@ -846,6 +870,9 @@ function Buffer() //{{{
             window.content.document.lastInputField = value;
         },
 
+        /**
+         * The current top-level document's URL.
+         */
         get URL()
         {
             return window.content.document.location.href;
@@ -856,6 +883,10 @@ function Buffer() //{{{
             return window.content.innerHeight;
         },
 
+        /**
+         * The current browser's text zoom level, as a percentage with
+         * 100 as 'normal'. Only affects text size.
+         */
         get textZoom()
         {
             return getBrowser().markupDocumentViewer.textZoom * 100;
@@ -865,6 +896,11 @@ function Buffer() //{{{
             setZoom(value, false);
         },
 
+        /**
+         * The current browser's text zoom level, as a percentage with
+         * 100 as 'normal'. Affects text size, as well as image size
+         * and block size.
+         */
         get fullZoom()
         {
             return getBrowser().markupDocumentViewer.fullZoom * 100;
@@ -874,14 +910,37 @@ function Buffer() //{{{
             setZoom(value, true);
         },
 
+        /**
+         * The current document's title.
+         */
         get title()
         {
             return window.content.document.title;
         },
 
+        /**
+         *
+         * @param {string} option The section's value in 'pageinfo'.
+         * @param {string} title The heading for this section's
+         *     output.
+         * @param {function} fn The function to generate this
+         *     section's output.
+         */
         addPageInfoSection: addPageInfoSection,
 
-        // returns an XPathResult object
+        /**
+         * Evaluates an XPath expression in the current or provided
+         * document.  It provides the xhtml and liberator XML
+         * namespaces. The result may be used as an iterator.
+         *
+         * @param {string} expression The XPath expression to evaluate.
+         * @param {Document} doc The document to evaluate the expression in.
+         * @default The current document.
+         * @param {Node} elem The context element.
+         * @default <b>doc</b>
+         * @param {boolean} asIterator Whether to return the results as an XPath
+         *     iterator.
+         */
         evaluateXPath: function (expression, doc, elem, asIterator)
         {
             if (!doc)
@@ -892,15 +951,10 @@ function Buffer() //{{{
             let result = doc.evaluate(expression, elem,
                 function lookupNamespaceURI(prefix)
                 {
-                  switch (prefix)
-                  {
-                    case "xhtml":
-                      return "http://www.w3.org/1999/xhtml";
-                    case "liberator":
-                      return NS.uri;
-                    default:
-                      return null;
-                  }
+                    return {
+                        xhtml: "http://www.w3.org/1999/xhtml",
+                        liberator: NS.uri
+                    }[prefix] || null;
                 },
                 asIterator ? XPathResult.ORDERED_NODE_ITERATOR_TYPE : XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
                 null
@@ -913,9 +967,13 @@ function Buffer() //{{{
             return result;
         },
 
-        // in contrast to vim, returns the selection if one is made,
-        // otherwise tries to guess the current word under the text cursor
-        // NOTE: might change the selection
+        /**
+         * Returns the currently selected word. If the selection is
+         * null, it tries to guess the word that the caret is
+         * positioned in.
+         *
+         * NOTE: might change the selection
+         */
         // FIXME: getSelection() doesn't always preserve line endings, see:
         // https://www.mozdev.org/bugs/show_bug.cgi?id=19303
         getCurrentWord: function ()
@@ -937,8 +995,13 @@ function Buffer() //{{{
             return String(selection);
         },
 
-        // more advanced than a simple elem.focus() as it also works for iframes
-        // and image maps
+        /**
+         * Focuses the given element. In contrast to a simple
+         * elem.focus() call, this function works for iframes and
+         * image maps.
+         *
+         * @param {Node} elem The element to focus.
+         */
         // TODO: merge with followLink()?
         focusElement: function (elem)
         {
@@ -963,6 +1026,17 @@ function Buffer() //{{{
             elem.dispatchEvent(evt);
         },
 
+        /**
+         * Try to guess links the like of "next" and "prev". Though it
+         * has a singularly horrendous name, it turns out to be quite
+         * useful.
+         *
+         * @param {string} rel The relationship to look for. Looks for
+         *     links with matching @rel or @rev attributes, and,
+         *     failing that, looks for an option named rel +
+         *     "pattern", and finds the last link matching that
+         *     RegExp.
+         */
         followDocumentRelationship: function (rel)
         {
             let regexps = options.get(rel + "pattern").values
@@ -1019,7 +1093,13 @@ function Buffer() //{{{
                 liberator.beep();
         },
 
-        // artificially "clicks" a link in order to open it
+        /**
+         * Fakes a click on a link.
+         *
+         * @param {Node} elem The element to click.
+         * @param {number} where Where to open the link. See
+         *     {@link liberator.open}.
+         */
         followLink: function (elem, where)
         {
             let doc = elem.ownerDocument;
@@ -1067,6 +1147,9 @@ function Buffer() //{{{
             });
         },
 
+        /**
+         * The current document's selection controller.
+         */
         get selectionController() getBrowser().docShell
                 .QueryInterface(Ci.nsIInterfaceRequestor)
                 .getInterface(Ci.nsISelectionDisplay)
@@ -1091,11 +1174,19 @@ function Buffer() //{{{
             }
         },
 
+        /**
+         * Scrolls to the bottom of the current buffer.
+         */
         scrollBottom: function ()
         {
             scrollToPercentiles(-1, 100);
         },
 
+        /**
+         * Scrolls the window laterally <b>cols</b> columns.
+         *
+         * @param {number} cols The number of columns to scroll.
+         */
         scrollColumns: function (cols)
         {
             let win = findScrollableWindow();
@@ -1107,11 +1198,19 @@ function Buffer() //{{{
             win.scrollBy(COL_WIDTH * cols, 0);
         },
 
+        /**
+         * Scrolls the buffer to its rightmost position.
+         */
         scrollEnd: function ()
         {
             scrollToPercentiles(100, -1);
         },
 
+        /**
+         * Scrolls the buffer vertically <b>lines</b> rows.
+         *
+         * @param {number} lines The number of lines to scroll.
+         */
         scrollLines: function (lines)
         {
             let win = findScrollableWindow();
@@ -1119,6 +1218,11 @@ function Buffer() //{{{
             win.scrollByLines(lines);
         },
 
+        /**
+         * Scrolls the buffer vertically <b>pages</b> pages.
+         *
+         * @param {number} pages The number of pages to scroll.
+         */
         scrollPages: function (pages)
         {
             let win = findScrollableWindow();
@@ -1140,6 +1244,9 @@ function Buffer() //{{{
                 win.scrollBy(0, win.innerHeight / 2 * direction);
         },
 
+        /**
+         * Scrolls the current buffer vertically to <b>percentage</b>
+         */
         scrollToPercentile: function (percentage)
         {
             scrollToPercentiles(-1, percentage);
@@ -1156,11 +1263,17 @@ function Buffer() //{{{
             content.scrollTo(x, y);
         },
 
+        /**
+         * Scrolls the current buffer laterally to its leftmost.
+         */
         scrollStart: function ()
         {
             scrollToPercentiles(0, -1);
         },
 
+        /**
+         * Scrolls the current buffer vertically to its top.
+         */
         scrollTop: function ()
         {
             scrollToPercentiles(-1, 0);
@@ -1322,6 +1435,9 @@ function Buffer() //{{{
     //}}}
 }; //}}}
 
+/**
+ * @instance marks
+ */
 function Marks() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/commands.js b/common/content/commands.js
index 7486d344..d357918d 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 // Do NOT create instances of this class yourself, use the helper method
 // commands.add() instead
 function Command(specs, description, action, extraInfo) //{{{
@@ -147,6 +149,9 @@ Command.prototype = {
 
 }; //}}}
 
+/**
+ * @instance commands
+ */
 function Commands() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/completion.js b/common/content/completion.js
index f9ddee03..2c119f95 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 /** 
  * Creates a new completion context.
  *
@@ -647,6 +649,9 @@ CompletionContext.prototype = {
     }
 }; //}}}
 
+/**
+ * @instance completion
+ */
 function Completion() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/editor.js b/common/content/editor.js
index 6219a4ea..5c9ffedb 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -26,9 +26,14 @@ 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 *****/
 
+/** @scope modules */
+
 // command names taken from:
 // http://developer.mozilla.org/en/docs/Editor_Embedding_Guide
 
+/**
+ * @instance editor
+ */
 function Editor() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/events.js b/common/content/events.js
index c477cb80..3009eee6 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -26,6 +26,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 *****/
 
+/** @scope modules */
+
+/**
+ * @instance autocommands
+ */
 function AutoCommands() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
@@ -277,6 +282,9 @@ function AutoCommands() //{{{
     //}}}
 }; //}}}
 
+/**
+ * @instance events
+ */
 function Events() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/find.js b/common/content/find.js
index 923426f5..72c77388 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 // TODO: proper backwards search - implement our own component?
 //     : implement our own highlighter?
 //     : frameset pages
@@ -37,6 +39,9 @@ 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 "liberator" object is ready
+/**
+ * @instance search
+ */
 function Search() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/hints.js b/common/content/hints.js
index 90c7e14f..38f36436 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -26,6 +26,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 *****/
 
+/** @scope modules */
+
+/**
+ * @instance hints
+ */
 function Hints() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/io.js b/common/content/io.js
index 136b2b13..ba62b137 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -27,6 +27,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 *****/
 
+/** @scope modules */
+
 plugins.contexts = {};
 function Script(file)
 {
@@ -52,6 +54,9 @@ function Script(file)
 Script.prototype = plugins;
 
 // TODO: why are we passing around strings rather than file objects?
+/**
+ * @instance io
+ */
 function IO() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
@@ -838,7 +843,7 @@ lookup:
                 }
                 else if (/\.css$/.test(filename))
                 {
-                    storage.styles.registerSheet(uri.spec, !silent, true);
+                    storage.styles.registerSheet(uri.spec, true);
                 }
                 else
                 {
diff --git a/common/content/liberator.js b/common/content/liberator.js
index e5c8cfa8..015adf07 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
diff --git a/common/content/mappings.js b/common/content/mappings.js
index 7e35b115..d409ba79 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 // Do NOT create instances of this class yourself, use the helper method
 // mappings.add() instead
 function Map(modes, cmds, description, action, extraInfo) //{{{
@@ -76,6 +78,9 @@ Map.prototype = {
 
 }; //}}}
 
+/**
+ * @instance mappings
+ */
 function Mappings() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/modes.js b/common/content/modes.js
index 0159dd24..e79a67f4 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 const modes = (function () //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/options.js b/common/content/options.js
index 6373dcb6..a1844a5f 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 // do NOT create instances of this class yourself, use the helper method
 // options.add() instead
 function Option(names, description, type, defaultValue, extraInfo) //{{{
@@ -293,6 +295,9 @@ Option.validateCompleter = function (values)
         function (value) res.some(function (item) item[0] == value));
 }; //}}}
 
+/**
+ * @instance options
+ */
 function Options() //{{{
 {
     ////////////////////////////////////////////////////////////////////////////////
diff --git a/common/content/style.js b/common/content/style.js
index 62c14ef2..d2ef4d57 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -6,6 +6,19 @@
  it under any or all of those licenseses.
 }}} ***** END LICENSE BLOCK *****/
 
+/** @scope modules */
+
+/**
+ * @constant
+ * @property {string} The default highlighting rules. They have the
+ * form:
+ *    rule ::= selector space css
+ *    selector ::= group
+ *               | group "," css-selector
+ *               | group "," css-selector "," scope
+ *    group ::= groupname
+ *            | groupname css-selector
+ */
 // <css>
 Highlights.prototype.CSS = <![CDATA[
     Boolean     color: red;
@@ -114,6 +127,12 @@ Highlights.prototype.CSS = <![CDATA[
     }
     ]]>.toString();
 
+/**
+ * A class to manage highlighting rules. The parameters are the
+ * standard paramaters for any {@link Storage} object.
+ *
+ * @author Kris Maglione <maglione.k@gmail.com>
+ */
 function Highlights(name, store, serial)
 {
     var self = this;
@@ -161,25 +180,35 @@ function Highlights(name, store, serial)
                           .replace(";!important;", ";", "g"); // Seeming Spidermonkey bug
         css = style.selector + " { " + css + " }";
 
-        let error = styles.addSheet(style.selector, style.filter, css, true, force);
+        let error = styles.addSheet(style.selector, style.filter, css, true);
         if (error)
             return error;
         style.value = newStyle;
         highlight[style.class] = style;
     };
 
+    /**
+     * Gets a CSS selector given a highlight group.
+     */
     this.selector = function (class)
     {
         let [, hl, rest] = class.match(/^(\w*)(.*)/);
         return "[liberator|highlight~=" + hl + "]" + rest
     };
 
+    /**
+     * Clears all highlighting rules. Rules with default values are
+     * reset.
+     */
     this.clear = function ()
     {
         for (let [k, v] in Iterator(highlight))
             this.set(k, null, true);
     };
 
+    /**
+     * Reloads the values in {@link #CSS}.
+     */
     this.reload = function ()
     {
         this.CSS.replace(/\{((?:.|\n)*?)\}/g, function (_, _1) _1.replace(/\n\s*/g, " "))
@@ -203,6 +232,13 @@ function Highlights(name, store, serial)
     };
 }
 
+/**
+ * Manages named and unnamed user stylesheets, which apply to both
+ * chrome and content pages. The parameters are the standard
+ * paramaters for any {@link Storage} object.
+ *
+ * @author Kris Maglione <maglione.k@gmail.com>
+ */
 function Styles(name, store, serial)
 {
     /* Can't reference liberator or Components inside Styles --
@@ -233,7 +269,20 @@ function Styles(name, store, serial)
     this.__defineGetter__("systemNames", function () Iterator(systemNames));
     this.__defineGetter__("userNames", function () Iterator(userNames));
 
-    this.addSheet = function (name, filter, css, system, force)
+    /**
+     * Add a new stylesheet.
+     *
+     * @param {string} name The name given to the stylesheet by
+     *     which it may be later referenced.
+     * @param {string} filter The sites to which this sheet will
+     *     apply. Can be a domain name or a URL. Any URL ending in
+     *     "*" is matched as a prefix.
+     * @param {string} css The CSS to be applied.
+     * @param {boolean} system Declares whether this is a system or
+     *     user sheet. System sheets are used internally by
+     *     @liberator.
+     */
+    this.addSheet = function (name, filter, css, system)
     {
         let sheets = system ? systemSheets : userSheets;
         let names = system ? systemNames : userNames;
@@ -249,7 +298,7 @@ function Styles(name, store, serial)
             sheet.ref = [];
             try
             {
-                this.registerSheet(cssUri(wrapCSS(sheet)), !force);
+                this.registerSheet(cssUri(wrapCSS(sheet)));
                 this.registerAgentSheet(cssUri(wrapCSS(sheet)))
             }
             catch (e)
@@ -266,6 +315,10 @@ function Styles(name, store, serial)
         return null;
     };
 
+    /**
+     * Find sheets matching the parameters. See {@link #addSheet}
+     * for parameters.
+     */
     this.findSheets = function (name, filter, css, index, system)
     {
         let sheets = system ? systemSheets : userSheets;
@@ -284,6 +337,12 @@ function Styles(name, store, serial)
         return matches.map(function (i) sheets[i]);
     };
 
+    /**
+     * Remove a stylesheet. See {@link #addSheet} for parameters.
+     * In cases where <b>filter</b> is supplied, the given filters
+     * are removed from matching sheets. If any remain, the sheet is
+     * left in place.
+     */
     this.removeSheet = function (name, filter, css, index, system)
     {
         let self = this;
@@ -326,11 +385,15 @@ function Styles(name, store, serial)
         return matches.length;
     };
 
-    this.registerSheet = function (uri, doCheckSyntax, reload)
+    /**
+     * Register a user stylesheet at the given URI.
+     *
+     * @param {string} uri The UrI of the sheet to register.
+     * @param {boolean} reload Whether to reload any sheets that are
+     *     already registered.
+     */
+    this.registerSheet = function (uri, reload)
     {
-        //dump (uri + "\n\n");
-        if (doCheckSyntax)
-            checkSyntax(uri);
         if (reload)
             this.unregisterSheet(uri);
         uri = ios.newURI(uri, null, null);
@@ -338,6 +401,9 @@ function Styles(name, store, serial)
             sss.loadAndRegisterSheet(uri, sss.USER_SHEET);
     };
 
+    /**
+     * Unregister a sheet at the given URI.
+     */
     this.unregisterSheet = function (uri)
     {
         uri = ios.newURI(uri, null, null);
@@ -346,6 +412,10 @@ function Styles(name, store, serial)
     };
 
     // FIXME
+    /**
+     * Register an agent stylesheet.
+     * @deprecated
+     */
     this.registerAgentSheet = function (uri)
     {
         this.unregisterAgentSheet(uri);
@@ -353,6 +423,10 @@ function Styles(name, store, serial)
         sss.loadAndRegisterSheet(uri, sss.AGENT_SHEET);
     };
 
+    /**
+     * Unregister an agent stylesheet.
+     * @deprecated
+     */
     this.unregisterAgentSheet = function (uri)
     {
         uri = ios.newURI(uri, null, null);
@@ -373,65 +447,6 @@ function Styles(name, store, serial)
                               .join(", ");
         return namespace + "@-moz-document " + selectors + "{\n" + css + "\n}\n";
     }
-
-    let queryinterface = XPCOMUtils.generateQI([Ci.nsIConsoleListener]);
-    /* What happens if more than one thread tries to use this? */
-    let testDoc = document.implementation.createDocument(XHTML, "doc", null);
-    function checkSyntax(uri)
-    {
-        let errors = [];
-        let listener = {
-            QueryInterface: queryinterface,
-            observe: function (message)
-            {
-                try
-                {
-                    message = message.QueryInterface(Ci.nsIScriptError);
-                    if (message.sourceName == uri)
-                        errors.push(message);
-                }
-                catch (e) {}
-            }
-        };
-
-        try
-        {
-            consoleService.registerListener(listener);
-            if (testDoc.documentElement.firstChild)
-                testDoc.documentElement.removeChild(testDoc.documentElement.firstChild);
-            testDoc.documentElement.appendChild(util.xmlToDom(
-                    <html><head><link type="text/css" rel="stylesheet" href={uri}/></head></html>, testDoc));
-
-            while (true)
-            {
-                try
-                {
-                    // Throws NS_ERROR_DOM_INVALID_ACCESS_ERR if not finished loading
-                    testDoc.styleSheets[0].cssRules.length;
-                    break;
-                }
-                catch (e)
-                {
-                    if (e.name != "NS_ERROR_DOM_INVALID_ACCESS_ERR")
-                        return [e.toString()];
-                    sleep(10);
-                }
-            }
-        }
-        finally
-        {
-            consoleService.unregisterListener(listener);
-        }
-        if (errors.length)
-        {
-            let err = new Error("", errors[0].sourceName.replace(/^(chrome-data:text\/css,).*/, "$1..."), errors[0].lineNumber);
-            err.name = "CSSError";
-            err.message = errors.reduce(function (msg, e) msg + "; " + e.lineNumber + ": " + e.errorMessage,
-                errors.shift().errorMessage);
-            err.echoerr = err.fileName + ":" + err.lineNumber + ": " + err.message;
-            throw err;
-        }
-    }
 }
 let (array = util.Array)
 {
@@ -440,8 +455,16 @@ let (array = util.Array)
     };
 }
 
+/**
+ * @property {Styles}
+ */
 const styles = storage.newObject("styles", Styles, false);
+
+/**
+ * @property {Highlights}
+ */
 const highlight = storage.newObject("highlight", Highlights, false);
+
 highlight.CSS = Highlights.prototype.CSS;
 highlight.reload();
 
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 4e8512f2..fd3c6a24 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 // TODO: many methods do not work with Thunderbird correctly yet
 
 function Tabs() //{{{
diff --git a/common/content/template.js b/common/content/template.js
index 7b937537..0f7a08a3 100644
--- a/common/content/template.js
+++ b/common/content/template.js
@@ -1,3 +1,6 @@
+
+/** @scope modules */
+
 const template = {
     add: function add(a, b) a + b,
     join: function join(c) function (a, b) a + c + b,
diff --git a/common/content/ui.js b/common/content/ui.js
index 56fd1852..f046cce6 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 /*
  * This class is used for prompting of user input and echoing of messages
  *
diff --git a/common/content/util.js b/common/content/util.js
index d6499e57..3d3995f4 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -26,6 +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 *****/
 
+/** @scope modules */
+
 const XHTML = "http://www.w3.org/1999/xhtml";
 const NS = Namespace("liberator", "http://vimperator.org/namespaces/liberator");
 default xml namespace = XHTML;

From c51e3e4707e7c9065817fef5ccf42fff247516c8 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 14:57:34 -0500
Subject: [PATCH 028/143] Make sure that the hint number is in the viewport

---
 common/content/events.js | 81 ++++++++++++++++++++--------------------
 common/content/hints.js  |  4 +-
 common/content/util.js   |  9 +++++
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 3009eee6..c1432bbe 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1201,52 +1201,51 @@ function Events() //{{{
         // global escape handler, is called in ALL modes
         onEscape: function ()
         {
-            if (!modes.passNextKey)
+            if (modes.passNextKey)
+                return;
+            if (modes.passAllKeys)
             {
-                if (modes.passAllKeys)
-                {
-                    modes.passAllKeys = false;
-                    return;
-                }
+                modes.passAllKeys = false;
+                return;
+            }
 
-                switch (liberator.mode)
-                {
-                    case modes.NORMAL:
-                        // clear any selection made
-                        let selection = window.content.getSelection();
-                        try
-                        { // a simple if (selection) does not seem to work
-                            selection.collapseToStart();
-                        }
-                        catch (e) {}
+            switch (liberator.mode)
+            {
+                case modes.NORMAL:
+                    // clear any selection made
+                    let selection = window.content.getSelection();
+                    try
+                    { // a simple if (selection) does not seem to work
+                        selection.collapseToStart();
+                    }
+                    catch (e) {}
 
+                    modes.reset();
+                    break;
+
+                case modes.VISUAL:
+                    if (modes.extended & modes.TEXTAREA)
+                        liberator.mode = modes.TEXTAREA;
+                    else if (modes.extended & modes.CARET)
+                        liberator.mode = modes.CARET;
+                    break;
+
+                case modes.CARET:
+                    // setting this option will trigger an observer which will
+                    // care about all other details like setting the NORMAL mode
+                    options.setPref("accessibility.browsewithcaret", false);
+                    break;
+
+                case modes.INSERT:
+                    if ((modes.extended & modes.TEXTAREA) && !options["insertmode"])
+                        liberator.mode = modes.TEXTAREA;
+                    else
                         modes.reset();
-                        break;
+                    break;
 
-                    case modes.VISUAL:
-                        if (modes.extended & modes.TEXTAREA)
-                            liberator.mode = modes.TEXTAREA;
-                        else if (modes.extended & modes.CARET)
-                            liberator.mode = modes.CARET;
-                        break;
-
-                    case modes.CARET:
-                        // setting this option will trigger an observer which will
-                        // care about all other details like setting the NORMAL mode
-                        options.setPref("accessibility.browsewithcaret", false);
-                        break;
-
-                    case modes.INSERT:
-                        if ((modes.extended & modes.TEXTAREA) && !options["insertmode"])
-                            liberator.mode = modes.TEXTAREA;
-                        else
-                            modes.reset();
-                        break;
-
-                    default: // HINTS, CUSTOM or COMMAND_LINE
-                        modes.reset();
-                        break;
-                }
+                default: // HINTS, CUSTOM or COMMAND_LINE
+                    modes.reset();
+                    break;
             }
         },
 
diff --git a/common/content/hints.js b/common/content/hints.js
index 38f36436..511e1894 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -154,8 +154,8 @@ function Hints() //{{{
                 text = elem.textContent.toLowerCase();
 
             span = baseNodeAbsolute.cloneNode(true);
-            span.style.left = (rect.left + scrollX) + "px";
-            span.style.top = (rect.top + scrollY) + "px";
+            span.style.left = Math.max((rect.left + scrollX), scrollX) + "px";
+            span.style.top =  Math.max((rect.top  + scrollY), scrollY) + "px";
             fragment.appendChild(span);
 
             pageHints.push([elem, text, span, null, elem.style.backgroundColor, elem.style.color]);
diff --git a/common/content/util.js b/common/content/util.js
index 3d3995f4..cf5bdcb3 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -311,6 +311,15 @@ const util = { //{{{
 
     identity: function identity(k) k,
 
+    intersection: function (r1, r2) ({
+        get width()  this.right - this.left,
+        get height() this.bottom - this.top,
+        left: Math.max(r1.left, r2.left),
+        right: Math.min(r1.right, r2.right),
+        top: Math.max(r1.top, r2.top),
+        bottom: Math.min(r1.bottom, r2.bottom)
+    }),
+
     map: function map(obj, fn)
     {
         let ary = [];

From 20265324bcf50bfc2983fc093703753e59e22c6a Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 15:00:52 -0500
Subject: [PATCH 029/143] Fix ;f

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

diff --git a/common/content/hints.js b/common/content/hints.js
index 511e1894..283e153b 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -66,7 +66,7 @@ function Hints() //{{{
     const hintModes = {
         ";": Mode("Focus hint",                    function (elem) buffer.focusElement(elem),                             extended),
         a: Mode("Save hint with prompt",           function (elem) buffer.saveLink(elem, false)),
-        f: Mode("Focus frame",                     function (elem) elem.ownerDocument.defaultView.focus(), function () "//body | //html|body"),
+        f: Mode("Focus frame",                     function (elem) elem.ownerDocument.defaultView.focus(), function () "//body | //xhtml:body"),
         s: Mode("Save hint",                       function (elem) buffer.saveLink(elem, true)),
         o: Mode("Follow hint",                     function (elem) buffer.followLink(elem, liberator.CURRENT_TAB)),
         t: Mode("Follow hint in a new tab",        function (elem) buffer.followLink(elem, liberator.NEW_TAB)),

From 2c6015837f218bec1b9c41e0e780488f9d8314e6 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 19 Dec 2008 15:12:38 -0500
Subject: [PATCH 030/143] Fix g<, sort-of. Fix some commandline.echo quirks, as
 well.

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

diff --git a/common/content/ui.js b/common/content/ui.js
index f046cce6..bd5a8dfa 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -568,10 +568,10 @@ function CommandLine() //{{{
          * after interpolated data.
          */
         XML.ignoreWhitespace = typeof str != "xml";
-        let output = util.xmlToDom(<div class="ex-command-output" style="white-space: nowrap" highlight={highlightGroup}>{template.maybeXML(str)}</div>, doc);
+        lastMowOutput = <div class="ex-command-output" style="white-space: nowrap" highlight={highlightGroup}>{template.maybeXML(str)}</div>;
+        let output = util.xmlToDom(lastMowOutput, doc);
         XML.ignoreWhitespace = true;
 
-        lastMowOutput = output;
 
         // FIXME: need to make sure an open MOW is closed when commands
         //        that don't generate output are executed
@@ -778,8 +778,7 @@ function CommandLine() //{{{
         function ()
         {
             if (lastMowOutput)
-                commandline.echo(lastMowOutput,
-                    commandline.HL_NORMAL, commandline.FORCE_MULTILINE);
+                echoMultiline(lastMowOutput, commandline.HL_NORMAL);
             else
                 liberator.beep();
         });
@@ -997,7 +996,10 @@ function CommandLine() //{{{
                 let action = echoLine;
 
                 if (!single && (!outputContainer.collapsed || messageBox.value == lastEcho))
+                {
+                    highlightGroup += " Message";
                     action = echoMultiline;
+                }
 
                 if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || typeof str == "xml") && !(flags & this.FORCE_SINGLELINE))
                     action = echoMultiline;

From 313136a1f8ad8066ea5261e2baf12d7334b9d09d Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 24 Dec 2008 13:22:54 -0500
Subject: [PATCH 031/143] Cleanup io.js with relation to path separators

---
 common/content/completion.js |  2 +-
 common/content/io.js         | 33 ++++++++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index 60dc0af6..34ed8c5c 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1393,7 +1393,7 @@ function Completion() //{{{
             // TODO: use path for the description?
             io.getRuntimeDirectories("colors").forEach(function (dir) {
                 context.fork(dir.path, 0, null, function (context) {
-                    context.filter = dir.path + io.pathSeparator + context.filter;
+                    context.filter = dir.path + IO.PATH_SEP + context.filter;
                     completion.file(context);
                     context.title = ["Color Scheme"];
                     context.quote = ["", function (text) text.replace(/\.vimp$/, ""), ""];
diff --git a/common/content/io.js b/common/content/io.js
index de7eb73e..8a5ea056 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -104,12 +104,7 @@ function IO() //{{{
                        .map(function (dir) dir == "" ? io.getCurrentDirectory().path : dir);
     }
 
-    function replacePathSep(path)
-    {
-        if (WINDOWS)
-            return path.replace("/", "\\");
-        return path;
-    }
+    function replacePathSep(path) path.replace("/", IO.PATH_SEP, "g");
 
     function joinPaths(head, tail)
     {
@@ -272,7 +267,7 @@ function IO() //{{{
         function (args)
         {
             // TODO: "E172: Only one file name allowed"
-            let filename = args[0] || "~/" + (WINDOWS ? "_" : ".") + EXTENSION_NAME + "rc";
+            let filename = args[0] || io.getRCFile(null, true).path;
             let file = io.getFile(filename);
 
             if (file.exists() && !args.bang)
@@ -404,8 +399,6 @@ function IO() //{{{
 
         sourcing: null,
 
-        pathSeparator: WINDOWS ? "\\" : "/",
-
         expandPath: IO.expandPath,
 
         // TODO: there seems to be no way, short of a new component, to change
@@ -456,7 +449,7 @@ function IO() //{{{
             return dirs;
         },
 
-        getRCFile: function (dir)
+        getRCFile: function (dir, always)
         {
             dir = dir || "~";
 
@@ -470,8 +463,9 @@ function IO() //{{{
                 return rcFile1;
             else if (rcFile2.exists() && rcFile2.isFile())
                 return rcFile2;
-            else
-                return null;
+            else if (always)
+                return rcFile1;
+            return null;
         },
 
         // return a nsILocalFile for path where you can call isDirectory(), etc. on
@@ -921,15 +915,19 @@ lookup:
 
 }; //}}}
 
-IO.__defineGetter__("runtimePath", function () service["environment"].get(config.name.toUpperCase() + "_RUNTIME") ||
+IO.PATH_SEP = (function () {
+    let file = services.create("file");
+    file.append("foo");
+    return file.path[0];
+})();
+
+IO.__defineGetter__("runtimePath", function () services.get("environment").get(config.name.toUpperCase() + "_RUNTIME") ||
         "~/" + (liberator.has("Win32") ? "" : ".") + config.name.toLowerCase());
 
 IO.expandPath = function (path, relative)
 {
     // TODO: proper pathname separator translation like Vim - this should be done elsewhere
     const WINDOWS = liberator.has("Win32");
-    if (WINDOWS)
-        path = path.replace("/", "\\", "g");
 
     // expand any $ENV vars - this is naive but so is Vim and we like to be compatible
     // TODO: Vim does not expand variables set to an empty string (and documents it).
@@ -959,10 +957,7 @@ IO.expandPath = function (path, relative)
     // TODO: Vim expands paths twice, once before checking for ~, once
     // after, but doesn't document it. Is this just a bug? --Kris
     path = expand(path);
-
-    // FIXME: Should we be doing this here? I think it should be done
-    // by the arg parser or nowhere. --Kris
-    return path.replace("\\ ", " ", "g");
+    return path.replace("/", IO.PATH_SEP, "g");
 };
 
 // vim: set fdm=marker sw=4 ts=4 et:

From 91d824b4a60747bfff7afc9bd9063034a27a7014 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Wed, 24 Dec 2008 14:21:20 -0500
Subject: [PATCH 032/143] Fix io.js

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

diff --git a/common/content/io.js b/common/content/io.js
index 02e17856..b87e1e6f 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -941,7 +941,8 @@ IO.expandPath = function (path, relative)
     path = expand(path);
 
     // expand ~
-    if (!relative && (WINDOWS ? /^~(?:$|[\\\/])/ : /^~(?:$|\/)/).test(path))
+    // Yuck.
+    if (!relative && RegExp("~(?:$|[/" + util.escapeRegex(IO.PATH_SEP) + "])").test(path))
     {
         // Try $HOME first, on all systems
         let home = services.get("environment").get("HOME");

From d9b07c2ff6dde17ad17a66d2e5772ce8a3f9ca5e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 15 Jan 2009 18:03:04 +1100
Subject: [PATCH 033/143] Set MY_VIMPERATORRC when sourcing the RC file on
 startup.

---
 common/content/liberator.js          | 11 ++++++++---
 vimperator/NEWS                      |  2 +-
 vimperator/locale/en-US/starting.txt |  5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index dd5d396c..864472f0 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1284,11 +1284,13 @@ const liberator = (function () //{{{
             // TODO: we should have some class where all this guioptions stuff fits well
             hideGUI();
 
-            // finally, read a ~/.vimperatorrc and plugin/**.{vimp,js}
+            // finally, read the RC file and source plugins
             // make sourcing asynchronous, otherwise commands that open new tabs won't work
             setTimeout(function () {
 
-                let init = services.get("environment").get(config.name.toUpperCase() + "_INIT");
+                let extensionName = config.name.toUpperCase();
+                let init = services.get("environment").get(extensionName + "_INIT");
+
                 if (init)
                     liberator.execute(init);
                 else
@@ -1296,7 +1298,10 @@ const liberator = (function () //{{{
                     let rcFile = io.getRCFile("~");
 
                     if (rcFile)
+                    {
                         io.source(rcFile.path, true);
+                        services.get("environment").set("MY_" + extensionName + "RC", rcFile.path);
+                    }
                     else
                         liberator.log("No user RC file found", 3);
                 }
@@ -1313,7 +1318,7 @@ const liberator = (function () //{{{
 
                 // 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
+                // set before by any RC file
                 for (let option in options)
                 {
                     if (option.setter)
diff --git a/vimperator/NEWS b/vimperator/NEWS
index dc72df66..200d56e0 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -22,7 +22,7 @@
     * IMPORTANT: $VIMPERATOR_HOME is no longer used.
 
     * Added ~/.vimperator/info/{profile}/, similar to viminfo
-    * added $VIMPERATOR_RUNTIME, $VIMPERATOR_INIT
+    * add $VIMPERATOR_RUNTIME, $VIMPERATOR_INIT and $MY_VIMPERATORRC
     * :hardcopy now supports output redirection to a file on Unix and MacUnix
     * add ";f" extended hint mode to focus a frame
     * add "r", "l", and "b" to 'guioptions' to toggle the scrollbars.
diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt
index 0e6d060d..5bbe7b97 100644
--- a/vimperator/locale/en-US/starting.txt
+++ b/vimperator/locale/en-US/starting.txt
@@ -14,8 +14,9 @@ At startup, Vimperator completes the following tasks in order.
   .. |$VIMPERATOR_INIT| _$VIMPERATOR_INIT_ -- May contain a single ex
                                                 command (e.g.,
                                                 "[c]:source {file}[c]").
-  .. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its 
-                               contents are executed.
+  .. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its
+			       contents are executed and
+			       _$MY_VIMPERATORRC_ set to its path.
   .. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are 
                                executed.
 

From 5e811785c2f816c6c04f838cc86f9892d17bb60e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 15 Jan 2009 22:33:53 +1100
Subject: [PATCH 034/143] Mention the new :silent command in NEWS.

---
 vimperator/NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vimperator/NEWS b/vimperator/NEWS
index 200d56e0..2ddc16d3 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -21,7 +21,8 @@
     * IMPORTANT: 'verbose' is now by default at 1, set to 0 to not show any status messages
     * IMPORTANT: $VIMPERATOR_HOME is no longer used.
 
-    * Added ~/.vimperator/info/{profile}/, similar to viminfo
+    * add :silent
+    * add ~/.vimperator/info/{profile}/, similar to viminfo
     * add $VIMPERATOR_RUNTIME, $VIMPERATOR_INIT and $MY_VIMPERATORRC
     * :hardcopy now supports output redirection to a file on Unix and MacUnix
     * add ";f" extended hint mode to focus a frame

From 53f33e056143fa49a8909c6f34a10baded102930 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 17 Jan 2009 23:43:29 -0500
Subject: [PATCH 035/143] Allow ` as local mark

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

diff --git a/common/content/buffer.js b/common/content/buffer.js
index e23d4f9b..5c1631de 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1565,7 +1565,7 @@ function Marks() //{{{
         }
     }
 
-    function isLocalMark(mark) /^['"a-z]$/.test(mark);
+    function isLocalMark(mark) /^['`a-z]$/.test(mark);
     function isURLMark(mark) /^[A-Z0-9]$/.test(mark);
 
     function localMarkIter()

From eb4c5488b91b662f438df1acba9539176b404fcd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 5 Feb 2009 11:51:44 +1100
Subject: [PATCH 036/143] Move the MY_VIMPERATORRC NEWS item to the 2.1
 section.

---
 vimperator/NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vimperator/NEWS b/vimperator/NEWS
index 41428e93..65fb3371 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -1,6 +1,7 @@
 2009-XX-XX:
     * version 2.1 (probably)
     * add :silent
+    * add $MY_VIMPERATORRC
 
 2008-XX-XX:
     * version 2.0 (probably)
@@ -27,7 +28,7 @@
 
     * [count]<C-n> now goes to the [count]th next tab rather than the [count]th tab.
     * add ~/.vimperator/info/{profile}/, similar to viminfo
-    * add $VIMPERATOR_RUNTIME, $VIMPERATOR_INIT and $MY_VIMPERATORRC
+    * add $VIMPERATOR_RUNTIME, $VIMPERATOR_INIT
     * :hardcopy now supports output redirection to a file on Unix and MacUnix
     * add ";f" extended hint mode to focus a frame
     * add "r", "l", and "b" to 'guioptions' to toggle the scrollbars.

From 62bc7fb9b56cebbbfc161e5decb330df7f61ef74 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Feb 2009 22:17:59 +1100
Subject: [PATCH 037/143] Add "w" and "W" Normal mode mappings.

These work just like o/O and t/T but for new windows.
---
 vimperator/NEWS                      | 2 ++
 vimperator/content/config.js         | 8 ++++++++
 vimperator/locale/en-US/browsing.txt | 9 +++++++++
 3 files changed, 19 insertions(+)

diff --git a/vimperator/NEWS b/vimperator/NEWS
index ccda9cde..851be046 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -2,6 +2,8 @@
     * version 2.1 (probably)
     * add :silent
     * add $MY_VIMPERATORRC
+    * add ' and " local marks
+    * add "w" and "W" Normal mode mappings for symmetry with o/O and t/T
 
 2008-XX-XX:
     * version 2.0 (probably)
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index 1a37841a..0e8aa67c 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -210,6 +210,14 @@ const config = { //{{{
             "Open one or more URLs in a new tab, based on current location",
             function () { commandline.open(":", "tabopen " + buffer.URL, modes.EX); });
 
+        mappings.add([modes.NORMAL], ["w"],
+            "Open one or more URLs in a new window",
+            function () { commandline.open(":", "winopen ", modes.EX); });
+
+        mappings.add([modes.NORMAL], ["W"],
+            "Open one or more URLs in a new window, based on current location",
+            function () { commandline.open(":", "winopen " + buffer.URL, modes.EX); });
+
         mappings.add([modes.NORMAL],
             ["<C-a>"], "Increment last number in URL",
             function (count) { incrementURL(count > 1 ? count : 1); },
diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt
index 9b44fa8a..b8cd0b45 100644
--- a/vimperator/locale/en-US/browsing.txt
+++ b/vimperator/locale/en-US/browsing.txt
@@ -102,11 +102,20 @@ ________________________________________________________________________________
 
 |:winopen| |:wopen| |:winedit|
 ||:wino[pen][!] [a][arg1][a], [a][arg2][a], ...|| +
+||w||
 ________________________________________________________________________________
 Just like [c]:tabopen[c] but opens the resulting web page(s) in a new window.
 ________________________________________________________________________________
 
 
+|W| +
+||W||
+________________________________________________________________________________
+Open one or more URLs in a new window based on current location. Works like
+[m]w[m] but preselects current URL in the [c]:winopen[c] query.
+________________________________________________________________________________
+
+
 |<MiddleMouse>| |p| +
 ||p||
 ________________________________________________________________________________

From 13da8c45191205627e1ae006aa54d1dc9e7407e0 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 11 Mar 2009 01:02:12 +1100
Subject: [PATCH 038/143] Add new :messclear command to clear the message
 history.

---
 common/content/ui.js                | 10 ++++++++++
 vimperator/NEWS                     |  1 +
 vimperator/locale/en-US/index.txt   |  1 +
 vimperator/locale/en-US/message.txt |  7 +++++++
 4 files changed, 19 insertions(+)

diff --git a/common/content/ui.js b/common/content/ui.js
index b358aacd..a79f37e1 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -58,6 +58,11 @@ function CommandLine() //{{{
 
         get length() this._messages.length,
 
+        clear: function clear()
+        {
+            this._messages = [];
+        },
+
         add: function add(message)
         {
             if (!message)
@@ -975,6 +980,11 @@ function CommandLine() //{{{
         },
         { argCount: "0" });
 
+    commands.add(["messc[lear]"],
+        "Clear the message history",
+        function () { messageHistory.clear(); },
+        { argCount: "0" });
+
     commands.add(["sil[ent]"],
         "Run a command silently",
         function (args)
diff --git a/vimperator/NEWS b/vimperator/NEWS
index 851be046..63124c28 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -4,6 +4,7 @@
     * add $MY_VIMPERATORRC
     * add ' and " local marks
     * add "w" and "W" Normal mode mappings for symmetry with o/O and t/T
+    * add :messclear
 
 2008-XX-XX:
     * version 2.0 (probably)
diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt
index 5a6a2fbb..9651529c 100644
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -203,6 +203,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:mark[c]|| Mark current location within the web page +
 ||[c]:marks[c]|| Show all location marks of current web page +
 ||[c]:messages[c]|| Display previously given messages +
+||[c]:messclear[c]|| Clear the message history +
 ||[c]:mkvimperatorrc[c]|| Write current key mappings and changed options to the config file +
 ||[c]:nohlsearch[c]|| Remove the search highlighting +
 ||[c]:noremap[c]|| Map a key sequence without remapping keys +
diff --git a/vimperator/locale/en-US/message.txt b/vimperator/locale/en-US/message.txt
index 99c1d723..f7c18f9b 100644
--- a/vimperator/locale/en-US/message.txt
+++ b/vimperator/locale/en-US/message.txt
@@ -12,6 +12,13 @@ Display previously given messages.
 ________________________________________________________________________________
 
 
+|:messc| |:messclear| +
+||:messc[lear]||
+________________________________________________________________________________
+Clear the message history.
+________________________________________________________________________________
+
+
 |g<| +
 ||g<||
 ________________________________________________________________________________

From 431743b907b6d8092d6a250b028c19e18f7f0870 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 19 Mar 2009 00:06:45 +1100
Subject: [PATCH 039/143] Fix removal of duplicates from getAlbums() return
 value.

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

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index bcce7090..90f43460 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -189,7 +189,7 @@ function getAlbums(artist)
         i++;
     }
 
-    return util.Array.uniq(albumArray);
+    return util.Array.uniq(albumArray.map(String));
 }
 
 function getTracks(artist,album)

From 5329080b24d1daa82ed640f6f8932c1a58efceca Mon Sep 17 00:00:00 2001
From: kenneslin <ken@kenneslin.(none)>
Date: Thu, 19 Mar 2009 03:07:16 +0530
Subject: [PATCH 040/143] Added some media mappings, edited the getAlbums()
 function, renamed :playmedia to :filter and context titles in autocompletions

---
 common/content/completion.js |  9 ++++
 xulmus/content/player.js     | 93 +++++++++++++++++++++++++++---------
 2 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index 3135db74..2a82a54c 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1393,11 +1393,20 @@ function Completion() //{{{
         song: function song(context, args)
         {
             if (args.completeArg == 0)
+            {
+                context.title = ["Artists"];
                 context.completions = getArtists();
+            }
             else if (args.completeArg == 1)
+            {
+                context.title = ["Albums by "+args[0]];
                 context.completions = getAlbums(args[0]);
+            }
             else if (args.completeArg == 2)
+            {
+                context.title = ["Tracks from "+args[1]+" by "+args[0]];
                 context.completions = getTracks(args[0],args[1]);
+            }
         },
 
         buffer: function buffer(context)
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 90f43460..10611bf4 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -51,10 +51,10 @@ function Player() // {{{
         });
 
     mappings.add([modes.PLAYER],
-        ["l"], "Play Media",
+        ["f"], "Filter Library",
         function ()
         {
-            commandline.open(":", "playmedia ", modes.EX);
+            commandline.open(":", "filter ", modes.EX);
         });
 
     mappings.add([modes.PLAYER],
@@ -88,12 +88,52 @@ function Player() // {{{
             }
         });
 
-    /////////////////////////////////////////////////////////////////////////////}}}
+    mappings.add([modes.PLAYER],
+            ["h"], "Seek -10s",
+            function ()
+            {
+                if (gMM.playbackControl.position >= 10000)
+                    gMM.playbackControl.position = gMM.playbackControl.position - 10000;
+                else 
+                    gMM.playbackControl.position = 0;
+            });
+
+    mappings.add([modes.PLAYER],
+            ["l"], "Seek +10s",
+            function ()
+            {
+                if ((gMM.playbackControl.duration - gMM.playbackControl.position) >= 10000)
+                    gMM.playbackControl.position = gMM.playbackControl.position + 10000;
+                else
+                    gMM.playbackControl.position = gMM.playbackControl.duration;
+            });
+    
+    mappings.add([modes.PLAYER],
+            ["H"], "Seek -1m",
+            function ()
+            {
+                if (gMM.playbackControl.position >= 60000)
+                    gMM.playbackControl.position = gMM.playbackControl.position - 60000;
+                else 
+                    gMM.playbackControl.position = 0;
+            });
+
+    mappings.add([modes.PLAYER],
+            ["L"], "Seek +1m",
+            function ()
+            {
+                if ((gMM.playbackControl.duration - gMM.playbackControl.position) >= 60000)
+                    gMM.playbackControl.position = gMM.playbackControl.position + 60000;
+                else
+                    gMM.playbackControl.position = gMM.playbackControl.duration;
+            });
+
+    ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    commands.add(["playmedia"],
-        "Play Media",
+    commands.add(["f[ilter]"],
+        "Filter Tracks",
         function (args)
         {
             //Store the old view
@@ -105,20 +145,17 @@ function Player() // {{{
                                   .createInstance(Ci.sbIMutablePropertyArray);
 
             //args
-            if (args.length == 1)
+            switch (args.length)
             {
-                customProps.appendProperty(SBProperties.artistName,args[0].toString());
-            }
-            else if (args.length == 2)
-            {
-                customProps.appendProperty(SBProperties.artistName,args[0].toString());
-                customProps.appendProperty(SBProperties.albumName,args[1].toString());
-            }
-            else if (args.length == 3)
-            {
-                customProps.appendProperty(SBProperties.artistName,args[0].toString());
-                customProps.appendProperty(SBProperties.albumName,args[1].toString());
-                customProps.appendProperty(SBProperties.trackName,args[2].toString());
+                case 3:
+                    customProps.appendProperty(SBProperties.trackName,args[2].toString());
+                case 2:
+                    customProps.appendProperty(SBProperties.albumName,args[1].toString());
+                case 3:                                        
+                    customProps.appendProperty(SBProperties.artistName,args[0].toString());
+                    break;
+                default:
+                    break;
             }
 
             sqncr.playView(mainView, mainView.getIndexForItem(library.getItemsByProperties(customProps).queryElementAt(0,Ci.sbIMediaItem)));
@@ -127,7 +164,7 @@ function Player() // {{{
             completer: function (context, args) completion.song(context, args)
         });
 
-    /////////////////////////////////////////////////////////////////////////////}}}
+    /////////////////////////////////////////////////////////////////////////////}} }
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
@@ -179,17 +216,29 @@ function getArtistsArray()
 function getAlbums(artist)
 {
     var list = LibraryUtils.mainLibrary;
-    var albumArray = [];
+    var albumArray = [], returnArray = [];
     var items = list.getItemsByProperty(SBProperties.artistName, artist).enumerate();
-    var i = 0;
+    var i = 0, j = 0;
+    
 
     while (items.hasMoreElements()) {
         album = items.getNext().getProperty(SBProperties.albumName);
         albumArray[i] = [album, album];
+
+        if (i == 0)
+        {
+            returnArray[j] = albumArray[i];
+            j++;
+        }
+        else if (albumArray[i-1].toString() != albumArray[i].toString())
+        {
+             returnArray[i] = albumArray[i];
+             j++;
+        }
         i++;
     }
 
-    return util.Array.uniq(albumArray.map(String));
+    return returnArray;
 }
 
 function getTracks(artist,album)

From a4d178ea18cedd359cbdfe9b0c3fa731b446ce07 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 19 Mar 2009 13:20:23 +1100
Subject: [PATCH 041/143] Fix :filter {artist}.

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

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 10611bf4..a897f589 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -151,7 +151,7 @@ function Player() // {{{
                     customProps.appendProperty(SBProperties.trackName,args[2].toString());
                 case 2:
                     customProps.appendProperty(SBProperties.albumName,args[1].toString());
-                case 3:                                        
+                case 1:
                     customProps.appendProperty(SBProperties.artistName,args[0].toString());
                     break;
                 default:

From 122657730a3be2b42eda7748ccdf8a1b6804cce5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 00:44:08 +1100
Subject: [PATCH 042/143] Add initial rough version of player.html help file.

---
 xulmus/TODO                       | 1 +
 xulmus/content/config.js          | 4 +++-
 xulmus/locale/en-US/asciidoc.conf | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index dba2a80b..f03bffc7 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -4,3 +4,4 @@ Priority list:
 BUGS:
 
 FEATURES:
+9 Xulmus logo
diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index a83bfb74..27c6eb87 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -117,7 +117,7 @@ const config = { //{{{
 
     //TODO : Write intro.html and tutorial.html
     // they are sorted by relevance, not alphabetically
-    //helpFiles: [ "intro.html" ],
+    helpFiles: [ "player.html" ],
        /* "intro.html", "tutorial.html", "starting.html", "browsing.html",
         "buffer.html", "cmdline.html", "insert.html", "options.html",
         "pattern.html", "tabs.html", "hints.html", "map.html", "eval.html",
@@ -134,6 +134,8 @@ const config = { //{{{
 
     init: function ()
     {
+        options["helpfile"] = "player.html";
+
         //Adding a mode for Player
         //modes.addMode("PLAYER"); // Player mode for songbird
 
diff --git a/xulmus/locale/en-US/asciidoc.conf b/xulmus/locale/en-US/asciidoc.conf
index 4bcc4288..4187121a 100755
--- a/xulmus/locale/en-US/asciidoc.conf
+++ b/xulmus/locale/en-US/asciidoc.conf
@@ -13,7 +13,7 @@ email=stubenschrott@gmx.net
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset={encoding=UTF-8}" />
     <meta name="generator" content="AsciiDoc {asciidoc-version}" />
     <link rel="stylesheet" href="xhtml11.css" type="text/css" />
-    <link rel="icon" href="chrome://vimperator/skin/icon.png" type="image/png" />
+    <link rel="icon" href="chrome://xulmus/skin/icon.png" type="image/png" />
     <script type="application/x-javascript;version=1.8" src="help.js"></script>
     <title>{doctitle}</title>
   </head>
@@ -23,8 +23,8 @@ email=stubenschrott@gmx.net
 </h1>
 
 [replacements]
-LOGO=<div style="text-align: center;"><span class="vimperator-logo"></span></div>
-HEADER=<div style="float: right; padding-left: 1px;"> <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="data:image/gif;base64,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" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/> <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/> </fieldset> </form> </div> <span class="vimperator-logo"></span>
+LOGO=<div style="text-align: center;"><span class="xulmus-logo"></span></div>
+HEADER=<div style="float: right; padding-left: 1px;"> <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="data:image/gif;base64,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" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/> <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"/> </fieldset> </form> </div> <span class="xulmus-logo"></span>
 \[count\]=<span class="argument">&#91;count&#93;</span>
 \[!\]=<span class="argument">&#91;!&#93;</span>
 

From 56ee77ba4f32e5868cd4c7dd756c9a2906610ea8 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 00:48:41 +1100
Subject: [PATCH 043/143] Whitespace formatting fixes.

---
 common/content/completion.js |  6 +++---
 xulmus/content/player.js     | 33 ++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index 2a82a54c..f1a31114 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1399,13 +1399,13 @@ function Completion() //{{{
             }
             else if (args.completeArg == 1)
             {
-                context.title = ["Albums by "+args[0]];
+                context.title = ["Albums by " + args[0]];
                 context.completions = getAlbums(args[0]);
             }
             else if (args.completeArg == 2)
             {
-                context.title = ["Tracks from "+args[1]+" by "+args[0]];
-                context.completions = getTracks(args[0],args[1]);
+                context.title = ["Tracks from " + args[1] + " by " + args[0]];
+                context.completions = getTracks(args[0], args[1]);
             }
         },
 
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index a897f589..3ac85dba 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -94,7 +94,7 @@ function Player() // {{{
             {
                 if (gMM.playbackControl.position >= 10000)
                     gMM.playbackControl.position = gMM.playbackControl.position - 10000;
-                else 
+                else
                     gMM.playbackControl.position = 0;
             });
 
@@ -107,14 +107,14 @@ function Player() // {{{
                 else
                     gMM.playbackControl.position = gMM.playbackControl.duration;
             });
-    
+
     mappings.add([modes.PLAYER],
             ["H"], "Seek -1m",
             function ()
             {
                 if (gMM.playbackControl.position >= 60000)
                     gMM.playbackControl.position = gMM.playbackControl.position - 60000;
-                else 
+                else
                     gMM.playbackControl.position = 0;
             });
 
@@ -148,17 +148,17 @@ function Player() // {{{
             switch (args.length)
             {
                 case 3:
-                    customProps.appendProperty(SBProperties.trackName,args[2].toString());
+                    customProps.appendProperty(SBProperties.trackName, args[2].toString());
                 case 2:
-                    customProps.appendProperty(SBProperties.albumName,args[1].toString());
+                    customProps.appendProperty(SBProperties.albumName, args[1].toString());
                 case 1:
-                    customProps.appendProperty(SBProperties.artistName,args[0].toString());
+                    customProps.appendProperty(SBProperties.artistName, args[0].toString());
                     break;
                 default:
                     break;
             }
 
-            sqncr.playView(mainView, mainView.getIndexForItem(library.getItemsByProperties(customProps).queryElementAt(0,Ci.sbIMediaItem)));
+            sqncr.playView(mainView, mainView.getIndexForItem(library.getItemsByProperties(customProps).queryElementAt(0, Ci.sbIMediaItem)));
         },
         {
             completer: function (context, args) completion.song(context, args)
@@ -198,9 +198,10 @@ function getArtistsArray()
     var artistArray = [];
     var i = 0;
     // Count the number of media items for each distinct artist
-    while (artists.hasMore()) {
+    while (artists.hasMore())
+    {
         artist = artists.getNext();
-        artistArray[i] = [artist,artist];
+        artistArray[i] = [artist, artist];
         list.enumerateItemsByProperty(SBProperties.artistName,
             artist,
             listener,
@@ -219,9 +220,10 @@ function getAlbums(artist)
     var albumArray = [], returnArray = [];
     var items = list.getItemsByProperty(SBProperties.artistName, artist).enumerate();
     var i = 0, j = 0;
-    
 
-    while (items.hasMoreElements()) {
+
+    while (items.hasMoreElements())
+    {
         album = items.getNext().getProperty(SBProperties.albumName);
         albumArray[i] = [album, album];
 
@@ -241,7 +243,7 @@ function getAlbums(artist)
     return returnArray;
 }
 
-function getTracks(artist,album)
+function getTracks(artist, album)
 {
     var list = LibraryUtils.mainLibrary;
     var tracksArray = [];
@@ -249,11 +251,12 @@ function getTracks(artist,album)
                  .createInstance(Ci.sbIMutablePropertyArray);
     var i = 0;
 
-    pa.appendProperty(SBProperties.artistName,artist.toString());
-    pa.appendProperty(SBProperties.albumName,album.toString());
+    pa.appendProperty(SBProperties.artistName, artist.toString());
+    pa.appendProperty(SBProperties.albumName, album.toString());
     var items = list.getItemsByProperties(pa).enumerate();
 
-    while (items.hasMoreElements()) {
+    while (items.hasMoreElements())
+    {
         track = items.getNext().getProperty(SBProperties.trackName);
         tracksArray[i] = [track, track];
         i++;

From b68b0e2f5519863b293e6e2949f0bd567507650d Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Thu, 19 Mar 2009 20:14:13 +0530
Subject: [PATCH 044/143] Removed extra media page and content pane from
 install.rdf

---
 xulmus/install.rdf | 41 +----------------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/xulmus/install.rdf b/xulmus/install.rdf
index 68e17ae6..7dccc3a8 100755
--- a/xulmus/install.rdf
+++ b/xulmus/install.rdf
@@ -7,16 +7,7 @@
     <em:name>xulmus@vimperator.org</em:name>
     <em:version>0.1</em:version>
     <em:creator>Prathyush Thota</em:creator>
-
-
-    <em:description>VIM for SongBird brothers.</em:description>
-
-
-
-
-
-
-
+    <em:description>Makes Songbird behave like Vim and CMus.</em:description>
     <em:targetApplication>
       <Description>
         <em:id>songbird@songbirdnest.com</em:id>
@@ -24,35 +15,5 @@
         <em:maxVersion>1.1.0pre</em:maxVersion>
       </Description>
     </em:targetApplication>
-
-
-
-
-
-    <!-- Register a pane to be displayed below the service sidebar.
-         See http://wiki.songbirdnest.com/Developer/Articles/Getting_Started/Display_Panes -->
-    <songbird:displayPane>
-      <Description>
-        <songbird:contentTitle>xulmus</songbird:contentTitle>
-        <songbird:contentUrl>chrome://xulmus/content/pane.xul</songbird:contentUrl>
-        <songbird:contentIcon>chrome://xulmus/skin/pane-icon.png</songbird:contentIcon>
-        <songbird:defaultWidth>200</songbird:defaultWidth>
-        <songbird:defaultHeight>100</songbird:defaultHeight>
-        <songbird:suggestedContentGroups>servicepane</songbird:suggestedContentGroups>
-        <songbird:showOnInstall>true</songbird:showOnInstall>
-      </Description>
-    </songbird:displayPane>
-
-
-
-    <!-- Register a custom media page.
-         See http://wiki.songbirdnest.com/Developer/Articles/Getting_Started/Building_Media_Views -->
-    <songbird:mediaPage>
-      <Description>
-        <songbird:contentTitle>xulmus</songbird:contentTitle>
-        <songbird:contentUrl>chrome://xulmus/content/media-page.xul</songbird:contentUrl>
-      </Description>
-    </songbird:mediaPage>
-
   </Description>
 </RDF>

From 1ea343d5f815ac98f154210ae0decb2ef65d1451 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 02:31:30 +1100
Subject: [PATCH 045/143] Move some inline functionality to slots of player.

---
 xulmus/content/player.js | 188 +++++++++++++++++++++------------------
 1 file changed, 101 insertions(+), 87 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 3ac85dba..f949d86e 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -11,122 +11,70 @@ function Player() // {{{
     // Get the focus to the visible playlist first
     //window._SBShowMainLibrary();
 
+    // FIXME: need to test that we're playing - why is gMM.playbackControl.status always null?
+    // interval (seconds)
+    function seek(interval, direction)
+    {
+        interval = interval * 1000;
+
+        let min = 0;
+        let max = gMM.playbackControl.duration;
+        let position = gMM.playbackControl.position + (direction ? interval : -interval);
+
+        gMM.playbackControl.position = Math.min(Math.max(position, min), max)
+    }
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
     mappings.add([modes.PLAYER],
         ["x"], "Play Track",
-        function ()
-        {
-            gMM.sequencer.play();
-        });
+        function () { player.play(); });
 
     mappings.add([modes.PLAYER],
         ["z"], "Previous Track",
-        function ()
-        {
-            gSongbirdWindowController.doCommand("cmd_control_previous");
-        });
+        function () { player.previous(); });
 
     mappings.add([modes.PLAYER],
         ["c"], "Pause/Unpause Track",
-        function ()
-        {
-            gSongbirdWindowController.doCommand("cmd_control_playpause");
-        });
+        function () { player.togglePlayPause(); });
 
     mappings.add([modes.PLAYER],
         ["b"], "Next Track",
-        function ()
-        {
-            gSongbirdWindowController.doCommand("cmd_control_next");
-        });
+        function () { player.next(); });
 
     mappings.add([modes.PLAYER],
         ["v"], "Stop Track",
-        function ()
-        {
-            gMM.sequencer.stop();
-        });
+        function () { player.stop(); });
 
     mappings.add([modes.PLAYER],
         ["f"], "Filter Library",
-        function ()
-        {
-            commandline.open(":", "filter ", modes.EX);
-        });
+        function () { commandline.open(":", "filter ", modes.EX); });
 
     mappings.add([modes.PLAYER],
         ["s"], "Toggle Shuffle",
-        function ()
-        {
-            if (gMM.sequencer.mode != gMM.sequencer.MODE_SHUFFLE)
-                gMM.sequencer.mode = gMM.sequencer.MODE_SHUFFLE;
-            else
-                gMM.sequencer.mode = gMM.sequencer.MODE_FORWARD;
-        });
+        function () { player.toggleShuffle(); });
 
     mappings.add([modes.PLAYER],
         ["r"], "Toggle Repeat",
-        function ()
-        {
-            switch (gMM.sequencer.repeatMode)
-            {
-                case gMM.sequencer.MODE_REPEAT_NONE:
-                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ONE;
-                    break;
-                case gMM.sequencer.MODE_REPEAT_ONE:
-                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ALL;
-                    break;
-                case gMM.sequencer.MODE_REPEAT_ALL:
-                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE;
-                    break;
-                default:
-                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE;
-                    break;
-            }
-        });
+        function () { player.toggleRepeat(); });
 
     mappings.add([modes.PLAYER],
-            ["h"], "Seek -10s",
-            function ()
-            {
-                if (gMM.playbackControl.position >= 10000)
-                    gMM.playbackControl.position = gMM.playbackControl.position - 10000;
-                else
-                    gMM.playbackControl.position = 0;
-            });
+        ["h"], "Seek -10s",
+        function () { player.seekBackward(10); });
 
     mappings.add([modes.PLAYER],
-            ["l"], "Seek +10s",
-            function ()
-            {
-                if ((gMM.playbackControl.duration - gMM.playbackControl.position) >= 10000)
-                    gMM.playbackControl.position = gMM.playbackControl.position + 10000;
-                else
-                    gMM.playbackControl.position = gMM.playbackControl.duration;
-            });
+        ["l"], "Seek +10s",
+        function () { player.seekForward(10); });
 
     mappings.add([modes.PLAYER],
-            ["H"], "Seek -1m",
-            function ()
-            {
-                if (gMM.playbackControl.position >= 60000)
-                    gMM.playbackControl.position = gMM.playbackControl.position - 60000;
-                else
-                    gMM.playbackControl.position = 0;
-            });
+        ["H"], "Seek -1m",
+        function () { player.seekBackward(60); });
 
     mappings.add([modes.PLAYER],
-            ["L"], "Seek +1m",
-            function ()
-            {
-                if ((gMM.playbackControl.duration - gMM.playbackControl.position) >= 60000)
-                    gMM.playbackControl.position = gMM.playbackControl.position + 60000;
-                else
-                    gMM.playbackControl.position = gMM.playbackControl.duration;
-            });
+        ["L"], "Seek +1m",
+        function () { player.seekForward(60); });
 
     ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
@@ -137,11 +85,11 @@ function Player() // {{{
         function (args)
         {
             //Store the old view
-            //var prev_view = gMM.status.view;
-            var library = LibraryUtils.mainLibrary;
-            var mainView = library.createView();
-            var sqncr = gMM.sequencer;
-            var customProps = Cc["@songbirdnest.com/Songbird/Properties/MutablePropertyArray;1"]
+            //let prev_view = gMM.status.view;
+            let library = LibraryUtils.mainLibrary;
+            let mainView = library.createView();
+            let sqncr = gMM.sequencer;
+            let customProps = Cc["@songbirdnest.com/Songbird/Properties/MutablePropertyArray;1"]
                                   .createInstance(Ci.sbIMutablePropertyArray);
 
             //args
@@ -164,10 +112,76 @@ function Player() // {{{
             completer: function (context, args) completion.song(context, args)
         });
 
-    /////////////////////////////////////////////////////////////////////////////}} }
+    /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    return {
+
+        play: function play()
+        {
+            gMM.sequencer.play();
+        },
+
+        stop: function stop()
+        {
+            gMM.sequencer.stop();
+        },
+
+        next: function next()
+        {
+            gSongbirdWindowController.doCommand("cmd_control_next");
+        },
+
+        previous: function previous()
+        {
+            gSongbirdWindowController.doCommand("cmd_control_previous");
+        },
+
+        togglePlayPause: function togglePlayPause()
+        {
+            gSongbirdWindowController.doCommand("cmd_control_playpause");
+        },
+
+        toggleShuffle: function toggleShuffle()
+        {
+            if (gMM.sequencer.mode != gMM.sequencer.MODE_SHUFFLE)
+                gMM.sequencer.mode = gMM.sequencer.MODE_SHUFFLE;
+            else
+                gMM.sequencer.mode = gMM.sequencer.MODE_FORWARD;
+        },
+
+        // FIXME: not really toggling - good enough for now.
+        toggleRepeat: function toggleRepeat()
+        {
+            switch (gMM.sequencer.repeatMode)
+            {
+                case gMM.sequencer.MODE_REPEAT_NONE:
+                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ONE;
+                    break;
+                case gMM.sequencer.MODE_REPEAT_ONE:
+                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ALL;
+                    break;
+                case gMM.sequencer.MODE_REPEAT_ALL:
+                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE;
+                    break;
+                default:
+                    gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE;
+                    break;
+            }
+        },
+
+        seekForward: function seekForward(interval)
+        {
+            seek(interval, true);
+        },
+
+        seekBackward: function seekBackward(interval)
+        {
+            seek(interval, false);
+        },
+
+    };
     //}}}
 } // }}}
 

From 43412fbaff7d2930c40a1f996d4e7ac0bb32daa6 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 02:37:53 +1100
Subject: [PATCH 046/143] Fix argCount for :filter - it requires an argument.

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

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index f949d86e..246ba040 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -109,6 +109,7 @@ function Player() // {{{
             sqncr.playView(mainView, mainView.getIndexForItem(library.getItemsByProperties(customProps).queryElementAt(0, Ci.sbIMediaItem)));
         },
         {
+            argCount: "+",
             completer: function (context, args) completion.song(context, args)
         });
 

From d0cb38691ee6081b0070019c0eea0b0276bfdd4d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 03:05:56 +1100
Subject: [PATCH 047/143] Add :player{play,pause,next,prev,stop} commands.

---
 xulmus/content/player.js       | 33 +++++++++---
 xulmus/locale/en-US/player.txt | 99 ++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+), 6 deletions(-)
 create mode 100644 xulmus/locale/en-US/player.txt

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 246ba040..30e3b29f 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -29,23 +29,23 @@ function Player() // {{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     mappings.add([modes.PLAYER],
-        ["x"], "Play Track",
+        ["x"], "Play track",
         function () { player.play(); });
 
     mappings.add([modes.PLAYER],
-        ["z"], "Previous Track",
+        ["z"], "Previous track",
         function () { player.previous(); });
 
     mappings.add([modes.PLAYER],
-        ["c"], "Pause/Unpause Track",
+        ["c"], "Pause/Unpause track",
         function () { player.togglePlayPause(); });
 
     mappings.add([modes.PLAYER],
-        ["b"], "Next Track",
+        ["b"], "Next track",
         function () { player.next(); });
 
     mappings.add([modes.PLAYER],
-        ["v"], "Stop Track",
+        ["v"], "Stop track",
         function () { player.stop(); });
 
     mappings.add([modes.PLAYER],
@@ -81,7 +81,7 @@ function Player() // {{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     commands.add(["f[ilter]"],
-        "Filter Tracks",
+        "Filter and play tracks",
         function (args)
         {
             //Store the old view
@@ -113,6 +113,27 @@ function Player() // {{{
             completer: function (context, args) completion.song(context, args)
         });
 
+    // TODO: better of as a single command, or cmus compatible E.g. :player-next? --djk
+    commands.add(["playern[ext]"],
+        "Play next track",
+        function () { player.next(); });
+
+    commands.add(["playerpr[ev]"],
+        "Play previous track",
+        function () { player.previous(); });
+
+    commands.add(["players[top]"],
+        "Stop track",
+        function () { player.stop(); });
+
+    commands.add(["playerp[lay]"],
+        "Play track",
+        function () { player.play(); });
+
+    commands.add(["playerpa[use]"],
+        "Pause/unpause track",
+        function () { player.togglePlayPause(); });
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
new file mode 100644
index 00000000..57b9f43e
--- /dev/null
+++ b/xulmus/locale/en-US/player.txt
@@ -0,0 +1,99 @@
+HEADER
+
+|player-mode| |player| +
+
+The following features apply to Player mode which is activated when the media
+tab has focus.
+
+|x| |:playerp| |:playerplay|
+||:playerp[lay]|| +
+||x||
+________________________________________________________________________________
+Play the current track.
+________________________________________________________________________________
+
+|z| |:playerpr| |:playerprev|
+||:playerpr[ev]|| +
+||z||
+________________________________________________________________________________
+Play the previous track.
+________________________________________________________________________________
+
+
+|b| |:playern| |:playernext|
+||:playern[ext]|| +
+||b||
+________________________________________________________________________________
+Play the next track.
+________________________________________________________________________________
+
+
+|c| |:playerpa| |:playerpause|
+||:playerpa[use]|| +
+||c||
+________________________________________________________________________________
+Pause/unpause the current track.
+________________________________________________________________________________
+
+
+|v| |:players| |:playerstop|
+||:players[top]|| +
+||v||
+________________________________________________________________________________
+Stop playing the current track.
+________________________________________________________________________________
+
+
+|x|
+||x||
+________________________________________________________________________________
+Toggle shuffle mode.
+________________________________________________________________________________
+
+
+|r|
+||r||
+________________________________________________________________________________
+Toggle repeat mode.
+________________________________________________________________________________
+
+
+|h|
+||h||
+________________________________________________________________________________
+Seek +10s.
+________________________________________________________________________________
+
+
+|l|
+||l||
+________________________________________________________________________________
+Seek -10s.
+________________________________________________________________________________
+
+
+|H|
+||H||
+________________________________________________________________________________
+Seek +1m.
+________________________________________________________________________________
+
+
+|L|
+||L||
+________________________________________________________________________________
+Seek -1m.
+________________________________________________________________________________
+
+
+|f| |:f| |:filter|
+||:f[ilter] [a][artist][a] [a]{album}[a] [a]{track}[a]|| +
+||f||
+________________________________________________________________________________
+Filter and play tracks. If only [a][artist][a] is specified then all tracks for
+that artist are played in album order. If {album} is also specified then all
+tracks for that album are played. A specific track can be specified with
+{track}.
+________________________________________________________________________________
+
+// vim: set filetype=asciidoc:

From 0d9c86a547727f52a752e2ca359f557d74cfc6f0 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Fri, 20 Mar 2009 01:19:02 +0530
Subject: [PATCH 048/143] Added increase/decrease commands

---
 xulmus/content/player.js       | 32 ++++++++++++++++++++++++++++----
 xulmus/locale/en-US/player.txt | 14 ++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 30e3b29f..f54b39ea 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -16,12 +16,13 @@ function Player() // {{{
     function seek(interval, direction)
     {
         interval = interval * 1000;
-
+        
         let min = 0;
         let max = gMM.playbackControl.duration;
+
         let position = gMM.playbackControl.position + (direction ? interval : -interval);
 
-        gMM.playbackControl.position = Math.min(Math.max(position, min), max)
+        gMM.playbackControl.position = Math.min(Math.max(position, min), max);
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}
@@ -75,6 +76,14 @@ function Player() // {{{
     mappings.add([modes.PLAYER],
         ["L"], "Seek +1m",
         function () { player.seekForward(60); });
+    
+    mappings.add([modes.PLAYER],
+         ["=","+"], "Increase Volume by 10%",
+         function () { player.increaseVolume(); });
+
+    mappings.add([modes.PLAYER],
+         ["-"], "Decrease Volume by 10%",
+         function () { player.decreaseVolume(); });
 
     ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
@@ -195,14 +204,29 @@ function Player() // {{{
 
         seekForward: function seekForward(interval)
         {
-            seek(interval, true);
+            if (gMM.playbackControl)
+                seek(interval, true);
         },
 
         seekBackward: function seekBackward(interval)
         {
-            seek(interval, false);
+            if (gMM.playbackControl)
+                seek(interval, false);
         },
 
+        //FIXME: 10% ?
+        increaseVolume: function increaseVolume()
+        {
+            gMM.volumeControl.volume = gMM.volumeControl.volume * 1.1;
+        },
+
+        decreaseVolume: function decreaseVolume()
+        {
+            if (gMM.volumeControl.volume == 0)
+                gMM.volumeControl.volume = 0.1;
+            else
+                gMM.volumeControl.volume = gMM.volumeControl.volume * 0.9;
+        },           
     };
     //}}}
 } // }}}
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 57b9f43e..8afaf1cc 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -86,6 +86,20 @@ Seek -1m.
 ________________________________________________________________________________
 
 
+|+| |=|
+||+|| +
+||=||
+________________________________________________________________________________
+Increase volume by 10%.
+________________________________________________________________________________
+
+|-|
+||-||
+________________________________________________________________________________
+Decrease volume by 10%.
+________________________________________________________________________________
+
+
 |f| |:f| |:filter|
 ||:f[ilter] [a][artist][a] [a]{album}[a] [a]{track}[a]|| +
 ||f||

From 032f7c098167753fabddd302013f3cfeb02ab324 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 13:37:52 +1100
Subject: [PATCH 049/143] Add count support to l, L, h and H mappings.

---
 xulmus/content/player.js       | 20 ++++++++++++--------
 xulmus/locale/en-US/player.txt |  6 +++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index f54b39ea..a54def75 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -16,7 +16,7 @@ function Player() // {{{
     function seek(interval, direction)
     {
         interval = interval * 1000;
-        
+
         let min = 0;
         let max = gMM.playbackControl.duration;
 
@@ -63,22 +63,26 @@ function Player() // {{{
 
     mappings.add([modes.PLAYER],
         ["h"], "Seek -10s",
-        function () { player.seekBackward(10); });
+        function (count) { player.seekBackward(count * 10); },
+        { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["l"], "Seek +10s",
-        function () { player.seekForward(10); });
+        function (count) { player.seekForward(count * 10); },
+        { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["H"], "Seek -1m",
-        function () { player.seekBackward(60); });
+        function (count) { player.seekBackward(count * 60); },
+        { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["L"], "Seek +1m",
-        function () { player.seekForward(60); });
-    
+        function (count) { player.seekForward(count * 60); },
+        { flags: Mappings.flags.COUNT });
+
     mappings.add([modes.PLAYER],
-         ["=","+"], "Increase Volume by 10%",
+         ["=", "+"], "Increase Volume by 10%",
          function () { player.increaseVolume(); });
 
     mappings.add([modes.PLAYER],
@@ -226,7 +230,7 @@ function Player() // {{{
                 gMM.volumeControl.volume = 0.1;
             else
                 gMM.volumeControl.volume = gMM.volumeControl.volume * 0.9;
-        },           
+        }
     };
     //}}}
 } // }}}
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 8afaf1cc..14768329 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -66,21 +66,21 @@ ________________________________________________________________________________
 
 
 |l|
-||l||
+||[count]l||
 ________________________________________________________________________________
 Seek -10s.
 ________________________________________________________________________________
 
 
 |H|
-||H||
+||[count]H||
 ________________________________________________________________________________
 Seek +1m.
 ________________________________________________________________________________
 
 
 |L|
-||L||
+||[count]L||
 ________________________________________________________________________________
 Seek -1m.
 ________________________________________________________________________________

From da38811c04b5115e546b05a9d4e9f9d33a849388 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 13:53:05 +1100
Subject: [PATCH 050/143] Add / and ? Player mode commands to TODO.

---
 xulmus/TODO              | 1 +
 xulmus/content/player.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/xulmus/TODO b/xulmus/TODO
index f03bffc7..1d54f9f2 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -5,3 +5,4 @@ BUGS:
 
 FEATURES:
 9 Xulmus logo
+9 / and ? possibly reusing "Jump to" functionality directly.
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index a54def75..941d9139 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -93,6 +93,7 @@ function Player() // {{{
     ////////////////////// COMMANDS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    // TODO: presumably this will eventually just filter the library view like cmus? --djk
     commands.add(["f[ilter]"],
         "Filter and play tracks",
         function (args)

From 5d652b78e614a7a3cf13c413e962f0d907990787 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 14:04:00 +1100
Subject: [PATCH 051/143] Update xulmus logo.

---
 xulmus/TODO               |   1 -
 xulmus/content/xulmus.png | Bin 2226 -> 1081 bytes
 xulmus/content/xulmus.svg |   6 +++---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index 1d54f9f2..c23341ef 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -4,5 +4,4 @@ Priority list:
 BUGS:
 
 FEATURES:
-9 Xulmus logo
 9 / and ? possibly reusing "Jump to" functionality directly.
diff --git a/xulmus/content/xulmus.png b/xulmus/content/xulmus.png
index 52ff0c8d68884c764a979fac72c1b2ee38753a66..f1b04d4f901d8144716b822feac785b613608427 100755
GIT binary patch
delta 1060
zcmV+<1l#+v5xEGEB!3`dNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;000DMK}|sb0I`mI`%#ks0004VQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x
z010qNS#tmY4#WTe4#WYKD-Ig~00WRoL_t(|+U=ZKNEJ~W#(&4OsK5tlkqUe0Nh2_b
zqS6+keY0rKB6}!^%+QMJp`v}Ef~>$6+Ft5KGuuNVO0a?`f+R@7hl*CBjk46+cevk$
zVYuead#;W7{ou#Bv)q|;&iwDp`Ogg3afA>;1d02{`w#fEUZRC*r!Ej8{24N!ZqOM~
z2nC{OyCis~Pk+K3SOJHHS-%nvhG*cSFiA&T1c`~QL?pC5Q=ikYH@pBB!#QvlOoC_O
z5?E)czCGYdI2NX|56!l#;BEHJBZXFUfw%&Wgqd(H-0fPnfd{<?F85Iz%3ybXo(ns{
zEZ1`L!+HYuTG&^Ac#{F{rac@$^Of~SABbOhFz>?c@P8_N3<tt3upZ9mdVZmhbzKj4
zFbFrot*`*@gTpNa;sFL>G2F(!X<$F5!wjB{g@rNVJqBGoJO{h6ba=okeb$EKEQ?(8
zj(V15TH4nTma}>JZQ!)IG(X^vB12(iFIm|P@53~9cppx0@?jg^u>2He-e;DbE$!<a
zOEdmVQGfWv?$R8>{L-@-ggxOmIM3&8X=p|}|CXKbAY4P=!#fPn3Z50K6jt^E(NGPa
zasX}y`_Ef(JL4^F=Ma1WSMf646;9`}r7TV6zQAYW=vEzwc??3sAehSo(bg%Y2~6UW
znW&8BSTu{5?p$?M^kc*nW`%~(EgX}P_G)DP?|)5fuWy9)sc)fn+o*3H6Sq>1sm*=Y
zF<h3T(6SSV$6z8n1=q1m<os~du$<b+^85(v^MPe*jN5IizFr<$9+S4|KwJpN!MAWV
z=M`{z0+SdomslQ#lU>_20d)k<im*OcT-!;GVY{1KUz5D;fzzDe6PD2TI>7PpI;XEG
zw11)-Bbs}L`}uj9>kRdg)5XjhZ@6w{gf8FN%&;$dw)qRr<RHE&%zerka1?y)S!VNT
zMRV($PXEL+$6rsLTICtBkeT3lSmIe$!az*odfrQ_NoY>+mWDZ)U!35La5KLw!ups@
zeJCu4wJ~gWbL*SNjM?<VD~@UF`CSvx=6?}sKloCiC4>+{2q8pt=)Jkv6VS0~8r^t}
zJ+<lrA%qY@2qA<JLI@#*5aK_<^%yB&-c-(Ug8%8#5&nR;oZws2<yf^E>$KzYJWNki
z_X%6LAMttLR5t(TGKD(&+d|P&fq2;ozIlzaVBAjxUKe~G0Vg@ZSNBtRmNaiq7aghV
egb+fASnwMq-@Lwybc4bG0000<MNUMnLSTYJ!uclv

delta 2214
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

diff --git a/xulmus/content/xulmus.svg b/xulmus/content/xulmus.svg
index 7e2983ed..c8e3603d 100755
--- a/xulmus/content/xulmus.svg
+++ b/xulmus/content/xulmus.svg
@@ -15,9 +15,9 @@
    inkscape:version="0.46"
    version="1.0"
    sodipodi:docbase="/home/maxauthority/code/vimperator"
-   sodipodi:docname="vimperator.svg"
+   sodipodi:docname="xulmus.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/maxauthority/code/vimperator/vimperator.png"
+   inkscape:export-filename="/home/maxauthority/code/vimperator/xulmus.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -73,7 +73,7 @@
          sodipodi:role="line"
          id="tspan2231"
          x="6.2673268"
-         y="29.896835">vimperator_</tspan></text>
+         y="29.896835">xulmus_</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:24px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans Mono"

From 8ae0b211f1d29af5749babd9851f2e468ec4786f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 16:04:23 +1100
Subject: [PATCH 052/143] Define missing window#BrowserStop and
 window#toJavascriptConsole.

---
 common/content/buffer.js | 16 ++--------------
 xulmus/content/config.js | 12 +++++++++++-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 8534f4ee..15b09ae0 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -215,13 +215,7 @@ function Buffer() //{{{
 
     mappings.add(myModes, ["<C-c>"],
         "Stop loading",
-        function ()
-        {
-            if(config.name == "Xulmus")
-                getBrowser().mCurrentBrowser.stop();
-            else
-             window.BrowserStop();
-        });
+        function () { window.BrowserStop(); });
 
     // scrolling
     mappings.add(myModes, ["j", "<Down>", "<C-e>"],
@@ -603,13 +597,7 @@ function Buffer() //{{{
 
     commands.add(["st[op]"],
         "Stop loading",
-        function ()
-        {
-            if (config.name == "Xulmus")
-                getBrowser().mCurrentBrowser.stop();
-            else
-                window.BrowserStop();
-        },
+        function () { window.BrowserStop(); },
         { argCount: "0" });
 
     commands.add(["vie[wsource]"],
diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 27c6eb87..e4a28018 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -182,6 +182,7 @@ const config = { //{{{
         liberator.loadModule("hints",      Hints);
         // Load the Player module
         liberator.loadModule("player",     Player);
+
         ////////////////////////////////////////////////////////////////////////////////
         ////////////////////// STYLES //////////////////////////////////////////////////
         /////////////////////////////////////////////////////////////////////////////{{{
@@ -489,8 +490,17 @@ const config = { //{{{
         options.add(["urlseparator"],
             "Set the separator regexp used to separate multiple URL args",
             "string", ",\\s");
+        //}}}
+
+        // TODO: mention this to SB devs, they seem keen to provide these
+        // functions to make porting from FF as simple as possible.
+        window.toJavaScriptConsole = function () {
+            toOpenWindowByType("global:console", "chrome://global/content/console.xul");
+        }
+        window.BrowserStop = function () {
+            getBrowser().mCurrentBrowser.stop();
+        }
     }
-    //}}}
 }; //}}}
 
 // vim: set fdm=marker sw=4 ts=4 et:

From 070332d1527f49e0493f6a9e4ca1426807d13220 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 17:31:54 +1100
Subject: [PATCH 053/143] Add TODO.

---
 xulmus/TODO | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xulmus/TODO b/xulmus/TODO
index c23341ef..6f60c324 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -5,3 +5,4 @@ BUGS:
 
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
+7 extended hint mode for opening links in FF

From 1423c78b021672ba7e25eb6957c14b6442c354a8 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 20 Mar 2009 18:49:17 +1100
Subject: [PATCH 054/143] Fix count handling of seek commands.

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

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 941d9139..e6d80ca3 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -63,22 +63,22 @@ function Player() // {{{
 
     mappings.add([modes.PLAYER],
         ["h"], "Seek -10s",
-        function (count) { player.seekBackward(count * 10); },
+        function (count) { player.seekBackward(Math.max(1, count) * 10); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["l"], "Seek +10s",
-        function (count) { player.seekForward(count * 10); },
+        function (count) { player.seekForward(Math.max(1, count) * 10); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["H"], "Seek -1m",
-        function (count) { player.seekBackward(count * 60); },
+        function (count) { player.seekBackward(Math.max(1, count) * 60); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["L"], "Seek +1m",
-        function (count) { player.seekForward(count * 60); },
+        function (count) { player.seekForward(Math.max(1, count) * 60); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],

From 32292c9823f5324d5f7b9c297265809fa69defd5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 21 Mar 2009 03:08:12 +1100
Subject: [PATCH 055/143] Add new :volume command.

---
 xulmus/TODO                    |  1 +
 xulmus/content/player.js       | 53 ++++++++++++++++++++++++++--------
 xulmus/locale/en-US/player.txt | 31 +++++++++++++++-----
 3 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index 6f60c324..109039ee 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -2,6 +2,7 @@ Priority list:
 1-9 as in Vim (9 = required for next release, 5 = would be nice, 1 = probably not)
 
 BUGS:
+- SB doesn't support tab-undo yet so :undo and "u" etc don't work
 
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index e6d80ca3..92322f93 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -11,10 +11,13 @@ function Player() // {{{
     // Get the focus to the visible playlist first
     //window._SBShowMainLibrary();
 
-    // FIXME: need to test that we're playing - why is gMM.playbackControl.status always null?
+    // FIXME: need to test that we're playing - gMM.status.state
     // interval (seconds)
     function seek(interval, direction)
     {
+        if (!gMM.playbackControl)
+            return;
+
         interval = interval * 1000;
 
         let min = 0;
@@ -127,7 +130,15 @@ function Player() // {{{
             completer: function (context, args) completion.song(context, args)
         });
 
-    // TODO: better of as a single command, or cmus compatible E.g. :player-next? --djk
+    // TODO: better off as a single command, or cmus compatible E.g. :player-next? --djk
+    commands.add(["playerp[lay]"],
+        "Play track",
+        function () { player.play(); });
+
+    commands.add(["playerpa[use]"],
+        "Pause/unpause track",
+        function () { player.togglePlayPause(); });
+
     commands.add(["playern[ext]"],
         "Play next track",
         function () { player.next(); });
@@ -140,13 +151,26 @@ function Player() // {{{
         "Stop track",
         function () { player.stop(); });
 
-    commands.add(["playerp[lay]"],
-        "Play track",
-        function () { player.play(); });
+    commands.add(["vol[ume]"],
+        "Set the volume",
+        function (args)
+        {
+            let arg = args[0];
 
-    commands.add(["playerpa[use]"],
-        "Pause/unpause track",
-        function () { player.togglePlayPause(); });
+            if (!/^[+-]?\d+$/.test(arg))
+            {
+                liberator.echoerr("E488: Trailing characters");
+                return;
+            }
+
+            let level = parseInt(arg, 10) / 100;
+
+            if (/^[+-]/.test(arg))
+                level = player.volume + level;
+
+            player.volume = Math.min(Math.max(level, 0), 1);
+        },
+        { argCount: 1 });
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
@@ -154,6 +178,13 @@ function Player() // {{{
 
     return {
 
+        // TODO: check bounds and round, 0 - 1 or 0 - 100?
+        get volume() gMM.volumeControl.volume,
+        set volume(value)
+        {
+            gMM.volumeControl.volume = value;
+        },
+
         play: function play()
         {
             gMM.sequencer.play();
@@ -209,14 +240,12 @@ function Player() // {{{
 
         seekForward: function seekForward(interval)
         {
-            if (gMM.playbackControl)
-                seek(interval, true);
+            seek(interval, true);
         },
 
         seekBackward: function seekBackward(interval)
         {
-            if (gMM.playbackControl)
-                seek(interval, false);
+            seek(interval, false);
         },
 
         //FIXME: 10% ?
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 14768329..3f9d4e97 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -5,6 +5,8 @@ HEADER
 The following features apply to Player mode which is activated when the media
 tab has focus.
 
+section:Playing{nbsp}tracks[playing-tracks]
+
 |x| |:playerp| |:playerplay|
 ||:playerp[lay]|| +
 ||x||
@@ -57,6 +59,20 @@ ________________________________________________________________________________
 Toggle repeat mode.
 ________________________________________________________________________________
 
+section:Filtering{nbsp}the{nbsp}library[filter,filtering]
+
+|f| |:f| |:filter|
+||:f[ilter] [a][artist][a] [a]{album}[a] [a]{track}[a]|| +
+||f||
+________________________________________________________________________________
+Filter and play tracks. If only [a][artist][a] is specified then all tracks for
+that artist are played in album order. If {album} is also specified then all
+tracks for that album are played. A specific track can be specified with
+{track}.
+________________________________________________________________________________
+
+
+section:Seeking{nbsp}to{nbsp}a{nbsp}track{nbsp}position[seeking]
 
 |h|
 ||h||
@@ -86,6 +102,8 @@ Seek -1m.
 ________________________________________________________________________________
 
 
+section:Adjusting{nbsp}the{nbsp}volume[volume]
+
 |+| |=|
 ||+|| +
 ||=||
@@ -93,6 +111,7 @@ ________________________________________________________________________________
 Increase volume by 10%.
 ________________________________________________________________________________
 
+
 |-|
 ||-||
 ________________________________________________________________________________
@@ -100,14 +119,12 @@ Decrease volume by 10%.
 ________________________________________________________________________________
 
 
-|f| |:f| |:filter|
-||:f[ilter] [a][artist][a] [a]{album}[a] [a]{track}[a]|| +
-||f||
+|:vol| |:volume|
+||:vol[ume][!] [a][value][a]|| +
+||:vol[ume][!] +{value} | -{value}|| +
 ________________________________________________________________________________
-Filter and play tracks. If only [a][artist][a] is specified then all tracks for
-that artist are played in album order. If {album} is also specified then all
-tracks for that album are played. A specific track can be specified with
-{track}.
+Set the player volume. [a][value][a] can be an absolute value between 0 and
+100% or a relative value if prefixed with "-" or "+".
 ________________________________________________________________________________
 
 // vim: set filetype=asciidoc:

From ca4efd13df1f0552b1a19da54abc2343b61cfed1 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 21 Mar 2009 13:18:47 +0530
Subject: [PATCH 056/143] Fixed play() to play first track of the visible view.

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

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 92322f93..beac81f1 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -187,7 +187,7 @@ function Player() // {{{
 
         play: function play()
         {
-            gMM.sequencer.play();
+            gMM.sequencer.playView(SBGetBrowser().currentMediaListView, 0);
         },
 
         stop: function stop()

From 0126043a6846a4d98246ea0e3f147084288080a4 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sun, 22 Mar 2009 01:35:55 +0530
Subject: [PATCH 057/143] Added :Filter command for filtering the view,
 searchTracks() for searching inside a visible view and focusTrack().

---
 xulmus/content/player.js | 71 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index beac81f1..2a028246 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -28,6 +28,11 @@ function Player() // {{{
         gMM.playbackControl.position = Math.min(Math.max(position, min), max);
     }
 
+    function focusTrack(mediaItem)
+    {
+        SBGetBrowser().mediaTab.mediaPage.highlightItem(_SBGetCurrentView().getIndexForItem(mediaItem));
+    }
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -55,6 +60,10 @@ function Player() // {{{
     mappings.add([modes.PLAYER],
         ["f"], "Filter Library",
         function () { commandline.open(":", "filter ", modes.EX); });
+    
+    mappings.add([modes.PLAYER],
+        ["F"], "Loads current view filtered by the keywords",
+        function () { commandline.open(":", "Filter ", modes.EX); });
 
     mappings.add([modes.PLAYER],
         ["s"], "Toggle Shuffle",
@@ -124,12 +133,34 @@ function Player() // {{{
             }
 
             sqncr.playView(mainView, mainView.getIndexForItem(library.getItemsByProperties(customProps).queryElementAt(0, Ci.sbIMediaItem)));
+            player.focusPlayingTrack();
         },
         {
             argCount: "+",
             completer: function (context, args) completion.song(context, args)
         });
 
+    commands.add(["F[ilter]"],
+            "Filter tracks based on keywords {artist/album/track}",
+            function (args)
+            {
+                let library = LibraryUtils.mainLibrary;
+                let myView = LibraryUtils.createStandardMediaListView(LibraryUtils.mainLibrary, args.string);
+                if (myView.length == 0)
+                    liberator.echoerr("No Tracks matching the keywords");
+                else
+                {
+                     SBGetBrowser().loadMediaList(LibraryUtils.mainLibrary, null, null, myView,
+                         "chrome://songbird/content/mediapages/filtersPage.xul");
+                     //TODO: make this focusTrack work ?
+                     focusTrack(myView.getItemByIndex(0));               
+                }
+            },
+            {
+                argCount: "+",
+           //     completer: function (context, args) completion.tracks(context, args);
+            });
+
     // TODO: better off as a single command, or cmus compatible E.g. :player-next? --djk
     commands.add(["playerp[lay]"],
         "Play track",
@@ -188,6 +219,7 @@ function Player() // {{{
         play: function play()
         {
             gMM.sequencer.playView(SBGetBrowser().currentMediaListView, 0);
+            focusTrack(gMM.sequencer.currentItem);    
         },
 
         stop: function stop()
@@ -208,6 +240,7 @@ function Player() // {{{
         togglePlayPause: function togglePlayPause()
         {
             gSongbirdWindowController.doCommand("cmd_control_playpause");
+            SBGetBrowser().mediaTab.mediaPage.highlightItem(_SBGetCurrentView().getIndexForItem(gMM.sequencer.currentItem));
         },
 
         toggleShuffle: function toggleShuffle()
@@ -260,7 +293,45 @@ function Player() // {{{
                 gMM.volumeControl.volume = 0.1;
             else
                 gMM.volumeControl.volume = gMM.volumeControl.volume * 0.9;
+        },
+
+        focusPlayingTrack :function focusPlayingTrack()
+        {
+            focusTrack(gMM.sequencer.currentItem);
+        },
+
+        listTracks: function listTracks(view)
+        {
+            //let myView = LibraryUtils.createStandardMediaListView(LibraryUtils.mainLibrary, args);
+            let length = view.length;
+            let tracksList = [];
+
+            for (var i=0; i < length; i++)
+            {
+                var mediaItem = view.getItemByIndex(i);
+                var trackName = mediaItem.getProperty(SBProperties.trackName);
+                var albumName = mediaItem.getProperty(SBProperties.albumName);
+                var artistName = mediaItem.getProperty(SBProperties.artistName);
+
+                tracksList[i] = [ trackName, "Album : "+albumName+" Artist : "+artistName ];
+            }
+            return tracksList;
+        },
+        //TODO: Use this for implementing "/" and "?". -ken
+        searchTracks: function searchTracks(args)
+        {
+            let currentView = _SBGetCurrentView();
+            let mediaItemList = currentView.mediaList;
+            let search = _getSearchString(currentView);
+            let searchString = "";
+            if (search != "")
+                searchString = args + " " + search;
+            else
+                searchString = args;    
+            let myView = LibraryUtils.createStandardMediaListView(mediaItemList, searchString);
+            focusTrack(myView.getItemByIndex(0));
         }
+
     };
     //}}}
 } // }}}

From 310d807746c6f88c38efd5279c7a5f8147eaa591 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sun, 22 Mar 2009 02:18:40 +0530
Subject: [PATCH 058/143] Added entry for :Filter in help page

---
 xulmus/TODO                    | 1 +
 xulmus/locale/en-US/player.txt | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/xulmus/TODO b/xulmus/TODO
index 109039ee..16d5bc28 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -7,3 +7,4 @@ BUGS:
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
 7 extended hint mode for opening links in FF
+5 Check for default extensions and add commands for them. Ex. Last.fm, Seeqpod e.t.c
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 3f9d4e97..ed7ecb01 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -72,6 +72,15 @@ tracks for that album are played. A specific track can be specified with
 ________________________________________________________________________________
 
 
+|F| |:F| |:Filter|
+||:F[ilter] {keywords}|| + 
+||F||
+________________________________________________________________________________
+Filter and show the tracks as a view. The tracks are filtered by the {keywords}
+provided as arguments. This text search applies over the default filter properties, 
+namely: Genre, Artist, and Album.
+________________________________________________________________________________
+
 section:Seeking{nbsp}to{nbsp}a{nbsp}track{nbsp}position[seeking]
 
 |h|

From a51cf072c9b145f6b00bd226f72ecbf395fef2de Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sun, 22 Mar 2009 05:42:51 +0530
Subject: [PATCH 059/143] Added TODO

---
 xulmus/TODO | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index 16d5bc28..c40dc405 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -6,5 +6,6 @@ BUGS:
 
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
-7 extended hint mode for opening links in FF
+8 Playlist/SmartPlaylist operations.
+7 extended hint mode for opening links in FF.
 5 Check for default extensions and add commands for them. Ex. Last.fm, Seeqpod e.t.c

From 2cfd2ee5bae4f139b69372993c7b572e94291c54 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sun, 22 Mar 2009 06:38:07 +0530
Subject: [PATCH 060/143] Modified play() for playing selected tracks in the
 view

---
 xulmus/content/player.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 2a028246..5fe543cb 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -218,8 +218,18 @@ function Player() // {{{
 
         play: function play()
         {
-            gMM.sequencer.playView(SBGetBrowser().currentMediaListView, 0);
-            focusTrack(gMM.sequencer.currentItem);    
+            //Check if there is any selection in place, else play first item of the visible view.
+            if (_SBGetCurrentView().selection.count != 0)
+            {
+                //Play the selection.
+                gMM.sequencer.playView(_SBGetCurrentView(),_SBGetCurrentView().getIndexForItem(_SBGetCurrentView().selection.currentMediaItem));
+                focusTrack(gMM.sequencer.currentItem);
+            }
+            else
+            {
+                gMM.sequencer.playView(SBGetBrowser().currentMediaListView, 0);
+                focusTrack(gMM.sequencer.currentItem);
+            }    
         },
 
         stop: function stop()

From 2216878c9dfd3b4a9a40068cda54c5a26175aea5 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 21 Mar 2009 15:02:09 +1100
Subject: [PATCH 061/143] Use green for the Xulmus logo's tilde.

---
 xulmus/content/xulmus.png | Bin 1081 -> 1082 bytes
 xulmus/content/xulmus.svg |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/xulmus/content/xulmus.png b/xulmus/content/xulmus.png
index f1b04d4f901d8144716b822feac785b613608427..e907ad058435d6df35e595fb1f49da6610a74e5a 100755
GIT binary patch
delta 908
zcmV;719SYj2)YQ6lo63hL_t(|+U=ZKNEJ~W#>b_Rr7M3zO0a?`f+R@7hl*CBjk46+
zce>xDVYuead#+vc`@xTMXSp-yocZ6G^Pd^6;|L*y@DuZo_wS3+dWjY$R$U-O@H3=O
z-Jmm~5DG-mc8T{)pMcr00uBwbekB|PPs4>ll8%@V5))gANML)WKBr(Wcpff-v*Avd
z2+zR9u+D!{eY?XIa12agADV4f!JF)x2MVq50&zJU0W;tlxXZO{Jr8;fToy%bD23hl
zc@FFdGhNHg59<-!V_{$Y;0*@2n|822%~RGNejtA4!MqK(!7K0~8~``NdN_~kMGFP2
z>pHldLAU{Kf%$MR9A+sH_cI8K;8ylc1N$)zrt^PnEG&!>?=a}%;91y}rNaYW8D(ua
z#<I{g?}%qvhNXQCW;u(O-v&;bOY=ScDAE;H_L7xN@GeYchxg|6#wcvVE0!OE%=^f)
zlcjyVVQI#n$qJvyU77=!UwRgUum}7C=SF#38k*70zhwtJ09Vtu@D>BKf@j4lg_XTP
zG*o}X#~gs0!T!@$+|D>l+c^lI!IivBcY)KmYza$~xzCTXadfK=#9RiUVIa)mfoSWL
z(0C?sNla8maV(n2OLvaCD*Q2GGP6QM;1-U_NP9N2{?{h9*C)jK)VEN(ZPd4piCYQB
z)aJhHXfDfEXxRzGqc8!UglkzQaDFgqSWbUwWO-hQ^?AoKCBp5tRbManEssgtbRaH(
zW8rJKiu3Y0J)TL7my0Y9!AY*|nt(bCXNFjx%dYJtMX=q?t*=SmcEhQT{|QUrd+p&k
zc#YFn6<Xnq5zRfref+%Cb%uJ+=^|#0*Il<V0+;VBX4n@z+x!7%a1h@V=04?gI1+!p
z^enUaw4%B7O{0I}i4$E<o?7J@v4EN2IausjR?I+5<a*vqs!3>$^OlA=n4cW~jc_x+
zG{pLtOnnF}gS8QCcXR8T%8c3c!wZgS>-k+1(B=_oU-(?1C4>+{2q8px=)Jkf<I}Ne
z8r^t}JhkcqA%qY@2qA<JLI@#*5aMt@;rC-C->)~7vmO6`x^#fwV7cReYq|_;R%4x5
zF3-jE1a+UVh5Heo_f2K<e=d`${<ToFSRh_<{BK^D<81dGf!7(Ihr@}E|JD6uo+ZuO
i(}n6fA%qYj68r=y-n_oc?avPY0000<MNUMnLSTYjCd7&W

delta 907
zcmV;619bel2)PK5lo60gL_t(|+U=ZKNEJ~W#>cdgr7M3TO0a?`f+R@7hl*CBjk46+
zcevk$VYuead#;W7{ou#Bv)q|;&iwDp`Ogg3afA>;1d02{`w#fEUZRC*r!Ej8{24N!
zZqOM~2nC{OyCis~Pr@8n0f&WIzY-3HXW*hRNk?1+iHWU5B(yzKpVP26yZ{%&IdB(D
zf@k3pSZ9B!zCGYdI2NX|56!l#;BEHJBZXFUfw%&Wgqd(H-0fPnfd{<?F85Iz%3ybX
zo(ns{EZ1`L!+HYuTG&^Ac#{F{rac@$^Of~SABbOhFz>?c@G5)^2f{6|9?s`_exZ<c
zT@QCK2sgs5umJ9Z!z~5k0R~|)+{V6XU_YkA44!|Dg@rNVJqBGoJO{h6ba=okeb$EK
zEQ?(8j(V15TH4nTma}>JZQ!)IG(X^vB12(iFIm|P@53~9cppx0@?jg^u>2He-e;Db
zE$!<aOEdmVQTW8}(j3D4(z6+aJ>fSv&*yDvXhu8#mYwh*TtnZ(I}FeYo)xPUR`vqX
zPz`^dasX}y`_Ef(JL4^F=Ma1WSMf646;9`}r7TV6zQAYW=vEzwc??3sAehSo(bg%Y
z2~6UWnW&8BSTu{5?p$?M^kc*nW`%~(EgX}P_G)DP?@es4Z-n)!Z=rVEsBaw;w^EL&
z&3)G~T$ZEIvJ;5MU?MyP*Rf3G{BYE;oZ5fL^85(v^MPe*jN5IizFr<$9+S4|KwJpN
z!MAWV=M`{z0+SdomslQ#lU>_20d)k<im*OcT-!;GVY{1KUz5D;fzzDe6PD2TI>7Pp
zI;XEGw4xg$ntO)(`FWY^4E2%I#mpLSxNc>HF5lVAurGSH`3uhEAigQgeaabd6nuZ}
zS!VNTMRV($PXEL+$6rsLTICtBkeT3lSmIe$!az*odfrQ_NoY>+mWDZ)U!35La5KLw
z!ups@eJCu4wJ~gWbL*SNjM?<VD~@UF`CSvx<`HQ>_)?)Igb+dqAw+cOy}8&E(6MP6
z-FS^Xwdw*Pgb+dqA%qY@2qA<J;y-V}^%yB&-c-(Ug8%8#5&nR;oZws2<yf^E>$KzY
zJWNki_X%6LAMttLR5t(TGKD(&+d|P&fq2;ozIlzaVBAjxUKe~G0Vg@ZSNBtRmNaiq
h7pd!n5JHGp@EaxHyuOQcgTep+002ovPDHLkV1hB1#wGv&

diff --git a/xulmus/content/xulmus.svg b/xulmus/content/xulmus.svg
index c8e3603d..9fa8c7b3 100755
--- a/xulmus/content/xulmus.svg
+++ b/xulmus/content/xulmus.svg
@@ -76,7 +76,7 @@
          y="29.896835">xulmus_</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:24px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans Mono"
+       style="font-size:24px;font-style:normal;font-weight:normal;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans Mono"
        x="6.4079518"
        y="53.183945"
        id="text2233"><tspan

From 032b5be2ae232f2b659730994fe8df91d49ba591 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 22 Mar 2009 16:08:18 +1100
Subject: [PATCH 062/143] Normalise case of player command and mapping
 descriptions.

---
 xulmus/content/config.js |  1 +
 xulmus/content/player.js | 53 +++++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index e4a28018..35bd1353 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -497,6 +497,7 @@ const config = { //{{{
         window.toJavaScriptConsole = function () {
             toOpenWindowByType("global:console", "chrome://global/content/console.xul");
         }
+
         window.BrowserStop = function () {
             getBrowser().mCurrentBrowser.stop();
         }
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 5fe543cb..d96414db 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -1,4 +1,4 @@
-//Import Artist List as this can be huge
+// Import Artist List as this can be huge
 
 var artists = getArtistsArray();
 
@@ -46,7 +46,7 @@ function Player() // {{{
         function () { player.previous(); });
 
     mappings.add([modes.PLAYER],
-        ["c"], "Pause/Unpause track",
+        ["c"], "Pause/unpause track",
         function () { player.togglePlayPause(); });
 
     mappings.add([modes.PLAYER],
@@ -58,19 +58,19 @@ function Player() // {{{
         function () { player.stop(); });
 
     mappings.add([modes.PLAYER],
-        ["f"], "Filter Library",
+        ["f"], "Filter library",
         function () { commandline.open(":", "filter ", modes.EX); });
-    
+
     mappings.add([modes.PLAYER],
         ["F"], "Loads current view filtered by the keywords",
         function () { commandline.open(":", "Filter ", modes.EX); });
 
     mappings.add([modes.PLAYER],
-        ["s"], "Toggle Shuffle",
+        ["s"], "Toggle shuffle",
         function () { player.toggleShuffle(); });
 
     mappings.add([modes.PLAYER],
-        ["r"], "Toggle Repeat",
+        ["r"], "Toggle repeat",
         function () { player.toggleRepeat(); });
 
     mappings.add([modes.PLAYER],
@@ -94,11 +94,11 @@ function Player() // {{{
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
-         ["=", "+"], "Increase Volume by 10%",
+         ["=", "+"], "Increase volume by 10%",
          function () { player.increaseVolume(); });
 
     mappings.add([modes.PLAYER],
-         ["-"], "Decrease Volume by 10%",
+         ["-"], "Decrease volume by 10%",
          function () { player.decreaseVolume(); });
 
     ////////////////// ///////////////////////////////////////////////////////////}}}
@@ -110,15 +110,15 @@ function Player() // {{{
         "Filter and play tracks",
         function (args)
         {
-            //Store the old view
-            //let prev_view = gMM.status.view;
+            // Store the old view
+            // let prev_view = gMM.status.view;
             let library = LibraryUtils.mainLibrary;
             let mainView = library.createView();
             let sqncr = gMM.sequencer;
             let customProps = Cc["@songbirdnest.com/Songbird/Properties/MutablePropertyArray;1"]
                                   .createInstance(Ci.sbIMutablePropertyArray);
 
-            //args
+            // args
             switch (args.length)
             {
                 case 3:
@@ -152,16 +152,16 @@ function Player() // {{{
                 {
                      SBGetBrowser().loadMediaList(LibraryUtils.mainLibrary, null, null, myView,
                          "chrome://songbird/content/mediapages/filtersPage.xul");
-                     //TODO: make this focusTrack work ?
-                     focusTrack(myView.getItemByIndex(0));               
+                     // TODO: make this focusTrack work ?
+                     focusTrack(myView.getItemByIndex(0));
                 }
             },
             {
                 argCount: "+",
-           //     completer: function (context, args) completion.tracks(context, args);
+                //completer: function (context, args) completion.tracks(context, args);
             });
 
-    // TODO: better off as a single command, or cmus compatible E.g. :player-next? --djk
+    // TODO: better off as a single command (:player play) or cmus compatible (:player-play)? --djk
     commands.add(["playerp[lay]"],
         "Play track",
         function () { player.play(); });
@@ -201,7 +201,7 @@ function Player() // {{{
 
             player.volume = Math.min(Math.max(level, 0), 1);
         },
-        { argCount: 1 });
+        { argCount: "1" });
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
@@ -218,18 +218,18 @@ function Player() // {{{
 
         play: function play()
         {
-            //Check if there is any selection in place, else play first item of the visible view.
+            // Check if there is any selection in place, else play first item of the visible view.
             if (_SBGetCurrentView().selection.count != 0)
             {
-                //Play the selection.
-                gMM.sequencer.playView(_SBGetCurrentView(),_SBGetCurrentView().getIndexForItem(_SBGetCurrentView().selection.currentMediaItem));
+                // Play the selection.
+                gMM.sequencer.playView(_SBGetCurrentView(), _SBGetCurrentView().getIndexForItem(_SBGetCurrentView().selection.currentMediaItem));
                 focusTrack(gMM.sequencer.currentItem);
             }
             else
             {
                 gMM.sequencer.playView(SBGetBrowser().currentMediaListView, 0);
                 focusTrack(gMM.sequencer.currentItem);
-            }    
+            }
         },
 
         stop: function stop()
@@ -291,7 +291,7 @@ function Player() // {{{
             seek(interval, false);
         },
 
-        //FIXME: 10% ?
+        // FIXME: 10% ?
         increaseVolume: function increaseVolume()
         {
             gMM.volumeControl.volume = gMM.volumeControl.volume * 1.1;
@@ -316,28 +316,31 @@ function Player() // {{{
             let length = view.length;
             let tracksList = [];
 
-            for (var i=0; i < length; i++)
+            for (var i = 0; i < length; i++)
             {
                 var mediaItem = view.getItemByIndex(i);
                 var trackName = mediaItem.getProperty(SBProperties.trackName);
                 var albumName = mediaItem.getProperty(SBProperties.albumName);
                 var artistName = mediaItem.getProperty(SBProperties.artistName);
 
-                tracksList[i] = [ trackName, "Album : "+albumName+" Artist : "+artistName ];
+                tracksList[i] = [trackName, "Album : " + albumName + " Artist : " + artistName];
             }
+
             return tracksList;
         },
-        //TODO: Use this for implementing "/" and "?". -ken
+        // TODO: Use this for implementing "/" and "?". -ken
         searchTracks: function searchTracks(args)
         {
             let currentView = _SBGetCurrentView();
             let mediaItemList = currentView.mediaList;
             let search = _getSearchString(currentView);
             let searchString = "";
+
             if (search != "")
                 searchString = args + " " + search;
             else
-                searchString = args;    
+                searchString = args;
+
             let myView = LibraryUtils.createStandardMediaListView(mediaItemList, searchString);
             focusTrack(myView.getItemByIndex(0));
         }

From 77d57431330b1f73c0125276809d46e982096fb1 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 22 Mar 2009 16:47:22 +1100
Subject: [PATCH 063/143] Add some broken commands to TODO#BUGS.

---
 xulmus/TODO | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index c40dc405..1a85e4cd 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -2,10 +2,14 @@ Priority list:
 1-9 as in Vim (9 = required for next release, 5 = would be nice, 1 = probably not)
 
 BUGS:
-- SB doesn't support tab-undo yet so :undo and "u" etc don't work
+- broken commands:
+  - SB doesn't support tab-undo yet so :undo and "u" etc don't work
+  - :tabduplicate
+  - :back/H, :forward,L
 
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
 8 Playlist/SmartPlaylist operations.
 7 extended hint mode for opening links in FF.
 5 Check for default extensions and add commands for them. Ex. Last.fm, Seeqpod e.t.c
+    Wouldn't these be provided as Xulmus plugins like Vimperator does? --djk

From 74dde82355c22b131bb0937da6d3b0f9a486e1f5 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Mon, 23 Mar 2009 04:49:35 +0530
Subject: [PATCH 064/143] Added getPlaylist() and playPlaylist() functions

---
 xulmus/content/player.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index d96414db..76208183 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -343,6 +343,40 @@ function Player() // {{{
 
             let myView = LibraryUtils.createStandardMediaListView(mediaItemList, searchString);
             focusTrack(myView.getItemByIndex(0));
+        },
+
+        getPlaylists: function getPlaylists()
+        {
+            var libraryManager = Components.classes["@songbirdnest.com/Songbird/library/Manager;1"]
+                .getService(Components.interfaces.sbILibraryManager);
+            var mainLibrary = libraryManager.mainLibrary;
+            var playlists = [mainLibrary];
+            var playlistsArray = [];
+            var listener =
+            {
+                onEnumerationBegin: function() { },
+                onEnumerationEnd: function() { },
+                onEnumeratedItem: function(list, item) 
+                {
+                    if (playlistsArray.indexOf(item.name)==-1)
+                    {
+                        playlists.push(item);
+                        playlistsArray.push(item.name);
+                    }
+                    return Components.interfaces.sbIMediaListEnumerationListener.CONTINUE;
+                }
+            };
+                  mainLibrary.enumerateItemsByProperty("http://songbirdnest.com/data/1.0#isList", "1", listener );
+                  return playlists;
+        },
+
+        // Play track at 'row' in 'playlist'
+        playPlaylist: function playPlaylist(playlist,row) 
+        {
+            var gMM = Components.classes["@songbirdnest.com/Songbird/Mediacore/Manager;1"]
+                .getService(Components.interfaces.sbIMediacoreManager);
+            gMM.sequencer.playView(playlist.createView(),row);
+
         }
 
     };

From f82ca27c6e09204ce90b39bf75a7d120ca4da3cd Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Mon, 23 Mar 2009 11:30:01 +0200
Subject: [PATCH 065/143] Update maxVersion of vimperator to latest Minefield

---
 vimperator/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimperator/install.rdf b/vimperator/install.rdf
index e709b06d..0d203952 100644
--- a/vimperator/install.rdf
+++ b/vimperator/install.rdf
@@ -20,7 +20,7 @@
 	    <Description>
 		<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 		<em:minVersion>3.0</em:minVersion>
-		<em:maxVersion>3.2a1pre</em:maxVersion>
+		<em:maxVersion>3.6a1pre</em:maxVersion>
 	    </Description>
 	</em:targetApplication>
     </Description>

From b4b62fc8360a51d000313fc18be2ac5ad645bfa9 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 23 Mar 2009 12:36:05 +0000
Subject: [PATCH 066/143] Fix #141 by not splitting URLs on quoted commas.

Added a new function util.splitLiteral(str, RegExp).
---
 common/content/util.js | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/common/content/util.js b/common/content/util.js
index ad41bd18..8ea3d22a 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -249,6 +249,40 @@ const util = { //{{{
         return delimiter + str.replace(/([\\'"])/g, "\\$1").replace("\n", "\\n", "g").replace("\t", "\\t", "g") + delimiter;
     },
 
+    /**
+     * Split a string on literal occurances of a marker.
+     *
+     * Specifically this ignores occurences preceded by a backslash, or
+     * contained within 'single' or "double" quotes.
+     *
+     * It assumes backslash escaping on strings, and will thus not count quotes
+     * that are preceded by a backslash or within other quotes as starting or
+     * ending quoted sections of the string.
+     *
+     * @param {string} str
+     * @param {RegExp} marker
+     */
+    splitLiteral: function splitLiteral(str, marker)
+    {
+        let results = [];
+        let resep = RegExp(/^(([^\\'"]|\\.|'([^\\']|\\.)*'|"([^\\"]|\\.)*")*?)/.source + marker.source);
+        let cont = true;
+
+        while (cont)
+        {
+            cont = false;
+            str = str.replace(resep, function (match, before)
+            {
+                results.push(before);
+                cont = true;
+                return "";
+            });
+        }
+
+        results.push(str);
+        return results;
+    },
+
     /**
      * Converts <b>bytes</b> to a pretty printed data size string.
      *
@@ -618,7 +652,7 @@ const util = { //{{{
      */
     stringToURLArray: function stringToURLArray(str)
     {
-        let urls = str.split(RegExp("\\s*" + options["urlseparator"] + "\\s*"));
+        let urls = util.splitLiteral(str, RegExp("\\s*" + options["urlseparator"] + "\\s*"));
 
         return urls.map(function (url) {
             try

From 53b5a54a1f5ea96d4e013ddaec41ec410291deb3 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 23 Mar 2009 14:41:41 +0000
Subject: [PATCH 067/143] Fix #198, Unicode escape next and previous pattern

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

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 458daa21..4cd9fdeb 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -146,13 +146,13 @@ function Buffer() //{{{
             getter: function () window.fullScreen
         });
 
-    options.add(["nextpattern"],
+        options.add(["nextpattern"], // \u00BB is » (>> in a single char)
         "Patterns to use when guessing the 'next' page in a document sequence",
-        "stringlist", "\\bnext\\b,^>$,^(>>|»)$,^(>|»),(>|»)$,\\bmore\\b");
+        "stringlist", "\\bnext\\b,^>$,^(>>|\u00BB)$,^(>|\u00BB),(>|\u00BB)$,\\bmore\\b");
 
-    options.add(["previouspattern"],
+    options.add(["previouspattern"], // \u00AB is « (<< in a single char)
         "Patterns to use when guessing the 'previous' page in a document sequence",
-        "stringlist", "\\bprev|previous\\b,^<$,^(<<|«)$,^(<|«),(<|«)$");
+        "stringlist", "\\bprev|previous\\b,^<$,^(<<|\u00AB)$,^(<|\u00AB),(<|\u00AB)$");
 
     options.add(["pageinfo", "pa"], "Desired info on :pa[geinfo]", "charlist", "gfm",
         {

From 77f277ddcc15960b6e35de76e07076322a21e06e Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Tue, 24 Mar 2009 04:18:43 +0530
Subject: [PATCH 068/143] Added :load [playlist]<tab>, command for loading
 specified playlist (autocompleted)

---
 common/content/completion.js | 15 +++++++++++++++
 xulmus/content/player.js     | 31 +++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/common/content/completion.js b/common/content/completion.js
index 5592ec36..d90b6bd4 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1409,6 +1409,21 @@ function Completion() //{{{
             }
         },
 
+        playlist: function playlist(context, args)
+        {
+            let playlists = Player().getPlaylists();
+            let length = playlists.length;
+            let playlistNames = [];
+
+            for (var i=0; i < length; i++)
+            {
+                playlistNames[i] = [playlists[i].name.toString(),playlists[i].name];
+            }
+            
+            context.title = ["Playlists"];
+            context.completions = playlistNames;
+        },
+
         buffer: function buffer(context)
         {
             filter = context.filter.toLowerCase();
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 76208183..448055b1 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -203,6 +203,37 @@ function Player() // {{{
         },
         { argCount: "1" });
 
+    commands.add(["load"],
+       "Load a playlist",
+       function (args)
+       {
+            
+            if (args.length != 0)
+            {
+                //load the selected playlist/smart playlist
+                let playlists = player.getPlaylists();
+                let length = playlists.length;
+                let playlistNames = [];
+
+                for (var i=0; i < length; i++)
+                {
+                    playlistNames[i] = playlists[i].name.toLowerCase();
+                }
+               
+                let playlist = args.string.replace("\\",""); 
+                SBGetBrowser().loadMediaList(playlists[playlistNames.indexOf(playlist.toLowerCase())]);
+                focusTrack(_SBGetCurrentView().getItemByIndex(0));    
+            }
+            else
+            {
+                //load main library if there are no args
+                _SBShowMainLibrary();
+            }
+       },
+       {
+            //args:
+            completer: function(context, args) completion.playlist(context, args)
+       });
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{

From 086f9d7971531fdfeff604446dd4387d36b4ebaf Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 23 Mar 2009 12:11:46 +1100
Subject: [PATCH 069/143] Formatting fixes.

---
 xulmus/content/player.js | 41 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 448055b1..8687d91d 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -347,12 +347,12 @@ function Player() // {{{
             let length = view.length;
             let tracksList = [];
 
-            for (var i = 0; i < length; i++)
+            for (let i = 0; i < length; i++)
             {
-                var mediaItem = view.getItemByIndex(i);
-                var trackName = mediaItem.getProperty(SBProperties.trackName);
-                var albumName = mediaItem.getProperty(SBProperties.albumName);
-                var artistName = mediaItem.getProperty(SBProperties.artistName);
+                let mediaItem = view.getItemByIndex(i);
+                let trackName = mediaItem.getProperty(SBProperties.trackName);
+                let albumName = mediaItem.getProperty(SBProperties.albumName);
+                let artistName = mediaItem.getProperty(SBProperties.artistName);
 
                 tracksList[i] = [trackName, "Album : " + albumName + " Artist : " + artistName];
             }
@@ -378,18 +378,17 @@ function Player() // {{{
 
         getPlaylists: function getPlaylists()
         {
-            var libraryManager = Components.classes["@songbirdnest.com/Songbird/library/Manager;1"]
-                .getService(Components.interfaces.sbILibraryManager);
-            var mainLibrary = libraryManager.mainLibrary;
-            var playlists = [mainLibrary];
-            var playlistsArray = [];
-            var listener =
-            {
+            let libraryManager = Components.classes["@songbirdnest.com/Songbird/library/Manager;1"]
+                                           .getService(Components.interfaces.sbILibraryManager);
+            let mainLibrary = libraryManager.mainLibrary;
+            let playlists = [mainLibrary];
+            let playlistsArray = [];
+            let listener = {
                 onEnumerationBegin: function() { },
                 onEnumerationEnd: function() { },
-                onEnumeratedItem: function(list, item) 
+                onEnumeratedItem: function(list, item)
                 {
-                    if (playlistsArray.indexOf(item.name)==-1)
+                    if (playlistsArray.indexOf(item.name) == -1)
                     {
                         playlists.push(item);
                         playlistsArray.push(item.name);
@@ -397,19 +396,17 @@ function Player() // {{{
                     return Components.interfaces.sbIMediaListEnumerationListener.CONTINUE;
                 }
             };
-                  mainLibrary.enumerateItemsByProperty("http://songbirdnest.com/data/1.0#isList", "1", listener );
-                  return playlists;
+            mainLibrary.enumerateItemsByProperty("http://songbirdnest.com/data/1.0#isList", "1", listener );
+            return playlists;
         },
 
         // Play track at 'row' in 'playlist'
-        playPlaylist: function playPlaylist(playlist,row) 
+        playPlaylist: function playPlaylist(playlist, row)
         {
-            var gMM = Components.classes["@songbirdnest.com/Songbird/Mediacore/Manager;1"]
-                .getService(Components.interfaces.sbIMediacoreManager);
-            gMM.sequencer.playView(playlist.createView(),row);
-
+            let gMM = Components.classes["@songbirdnest.com/Songbird/Mediacore/Manager;1"]
+                                .getService(Components.interfaces.sbIMediacoreManager);
+            gMM.sequencer.playView(playlist.createView(), row);
         }
-
     };
     //}}}
 } // }}}

From 663cd581a1cd30507802cf1455d8aaca835dd882 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 24 Mar 2009 15:00:18 +1100
Subject: [PATCH 070/143] Fix and document :load.

---
 common/content/completion.js   | 14 ++--------
 xulmus/content/player.js       | 51 +++++++++++++++++-----------------
 xulmus/locale/en-US/player.txt |  9 ++++++
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index d90b6bd4..7596362f 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1411,17 +1411,9 @@ function Completion() //{{{
 
         playlist: function playlist(context, args)
         {
-            let playlists = Player().getPlaylists();
-            let length = playlists.length;
-            let playlistNames = [];
-
-            for (var i=0; i < length; i++)
-            {
-                playlistNames[i] = [playlists[i].name.toString(),playlists[i].name];
-            }
-            
-            context.title = ["Playlists"];
-            context.completions = playlistNames;
+            context.title = ["Playlist", "Type"];
+            context.keys = { text: "name", description: "type" };
+            context.completions = player.getPlaylists();
         },
 
         buffer: function buffer(context)
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 8687d91d..d5b083b7 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -207,33 +207,37 @@ function Player() // {{{
        "Load a playlist",
        function (args)
        {
-            
-            if (args.length != 0)
-            {
-                //load the selected playlist/smart playlist
-                let playlists = player.getPlaylists();
-                let length = playlists.length;
-                let playlistNames = [];
+            let arg = args.literalArg;
 
-                for (var i=0; i < length; i++)
+            if (arg)
+            {
+                // load the selected playlist/smart playlist
+                let playlists = player.getPlaylists();
+
+                for ([i, list] in Iterator(playlists))
                 {
-                    playlistNames[i] = playlists[i].name.toLowerCase();
+                    if (util.compareIgnoreCase(arg, list.name) == 0)
+                    {
+                        SBGetBrowser().loadMediaList(playlists[i]);
+                        focusTrack(_SBGetCurrentView().getItemByIndex(0));
+                        return;
+                    }
                 }
-               
-                let playlist = args.string.replace("\\",""); 
-                SBGetBrowser().loadMediaList(playlists[playlistNames.indexOf(playlist.toLowerCase())]);
-                focusTrack(_SBGetCurrentView().getItemByIndex(0));    
+
+                liberator.echoerr("E475: Invalid argument: " + arg);
             }
             else
             {
-                //load main library if there are no args
+                // load main library if there are no args
                 _SBShowMainLibrary();
             }
        },
        {
-            //args:
-            completer: function(context, args) completion.playlist(context, args)
+            argCount: "?",
+            completer: function(context, args) completion.playlist(context, args),
+            literal: 0
        });
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -378,33 +382,30 @@ function Player() // {{{
 
         getPlaylists: function getPlaylists()
         {
-            let libraryManager = Components.classes["@songbirdnest.com/Songbird/library/Manager;1"]
-                                           .getService(Components.interfaces.sbILibraryManager);
-            let mainLibrary = libraryManager.mainLibrary;
+            let mainLibrary = LibraryUtils.mainLibrary;
             let playlists = [mainLibrary];
-            let playlistsArray = [];
             let listener = {
                 onEnumerationBegin: function() { },
                 onEnumerationEnd: function() { },
                 onEnumeratedItem: function(list, item)
                 {
-                    if (playlistsArray.indexOf(item.name) == -1)
+                    // FIXME: why are there null items and duplicates?
+                    if (!playlists.some(function (list) list.name == item.name) && item.name != null)
                     {
                         playlists.push(item);
-                        playlistsArray.push(item.name);
                     }
                     return Components.interfaces.sbIMediaListEnumerationListener.CONTINUE;
                 }
             };
-            mainLibrary.enumerateItemsByProperty("http://songbirdnest.com/data/1.0#isList", "1", listener );
+
+            mainLibrary.enumerateItemsByProperty("http://songbirdnest.com/data/1.0#isList", "1", listener);
+
             return playlists;
         },
 
         // Play track at 'row' in 'playlist'
         playPlaylist: function playPlaylist(playlist, row)
         {
-            let gMM = Components.classes["@songbirdnest.com/Songbird/Mediacore/Manager;1"]
-                                .getService(Components.interfaces.sbIMediacoreManager);
             gMM.sequencer.playView(playlist.createView(), row);
         }
     };
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index ed7ecb01..f4baae92 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -136,4 +136,13 @@ Set the player volume. [a][value][a] can be an absolute value between 0 and
 100% or a relative value if prefixed with "-" or "+".
 ________________________________________________________________________________
 
+section:Managing{nbsp}playlists[playlists]
+
+|:load|
+||:load [a][playlist][a]|| +
+________________________________________________________________________________
+Load [a][playlist][a]. If no playlist is specified then the main library view
+is loaded.
+________________________________________________________________________________
+
 // vim: set filetype=asciidoc:

From b6cb5785adbef0cb7bef5d74d7b36176e6679a74 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 24 Mar 2009 15:02:56 +1100
Subject: [PATCH 071/143] Fix :help :back/:forward formatting.

---
 vimperator/locale/en-US/browsing.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt
index 9b44fa8a..c2a7dbba 100644
--- a/vimperator/locale/en-US/browsing.txt
+++ b/vimperator/locale/en-US/browsing.txt
@@ -160,7 +160,7 @@ ________________________________________________________________________________
 section:Navigating[navigating]
 
 |H| |<C-o>| |CTRL-O| |:ba| |:back|
-||:[count]ba[ck] [url]|| +
+||:[count]ba[ck] [a][url][a]|| +
 ||:ba[ck]!|| +
 ||CTRL-o||
 ________________________________________________________________________________
@@ -171,7 +171,7 @@ ________________________________________________________________________________
 
 
 |L| |<C-i>| |CTRL-i| |:fo| |:fw| |:forward|
-||:[count]fo[rward] [url]|| +
+||:[count]fo[rward] [a][url][a]|| +
 ||:fo[rward]!|| +
 ||CTRL-i||
 ________________________________________________________________________________

From 827f450a549a08ce4570b1e3f2445aa59e2c3a04 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Tue, 24 Mar 2009 15:48:36 +1100
Subject: [PATCH 072/143] Add a :seek command.

---
 xulmus/content/player.js       | 78 ++++++++++++++++++++++++++--------
 xulmus/locale/en-US/player.txt | 36 ++++++++++------
 2 files changed, 84 insertions(+), 30 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index d5b083b7..6a5e6397 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -11,21 +11,11 @@ function Player() // {{{
     // Get the focus to the visible playlist first
     //window._SBShowMainLibrary();
 
-    // FIXME: need to test that we're playing - gMM.status.state
-    // interval (seconds)
+    // interval (milliseconds)
     function seek(interval, direction)
     {
-        if (!gMM.playbackControl)
-            return;
-
-        interval = interval * 1000;
-
-        let min = 0;
-        let max = gMM.playbackControl.duration;
-
-        let position = gMM.playbackControl.position + (direction ? interval : -interval);
-
-        gMM.playbackControl.position = Math.min(Math.max(position, min), max);
+        let position = gMM.playbackControl ? gMM.playbackControl.position : 0;
+        player.seekTo(position + (direction ? interval : -interval));
     }
 
     function focusTrack(mediaItem)
@@ -75,22 +65,22 @@ function Player() // {{{
 
     mappings.add([modes.PLAYER],
         ["h"], "Seek -10s",
-        function (count) { player.seekBackward(Math.max(1, count) * 10); },
+        function (count) { player.seekBackward(Math.max(1, count) * 10000); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["l"], "Seek +10s",
-        function (count) { player.seekForward(Math.max(1, count) * 10); },
+        function (count) { player.seekForward(Math.max(1, count) * 10000); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["H"], "Seek -1m",
-        function (count) { player.seekBackward(Math.max(1, count) * 60); },
+        function (count) { player.seekBackward(Math.max(1, count) * 60000); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
         ["L"], "Seek +1m",
-        function (count) { player.seekForward(Math.max(1, count) * 60); },
+        function (count) { player.seekForward(Math.max(1, count) * 60000); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
@@ -141,7 +131,7 @@ function Player() // {{{
         });
 
     commands.add(["F[ilter]"],
-            "Filter tracks based on keywords {artist/album/track}",
+            "Filter tracks based on keywords {genre/artist/album/track}",
             function (args)
             {
                 let library = LibraryUtils.mainLibrary;
@@ -182,6 +172,44 @@ function Player() // {{{
         "Stop track",
         function () { player.stop(); });
 
+    commands.add(["see[k]"],
+        "Seek to a track position",
+        function (args)
+        {
+            let arg = args[0];
+
+            // intentionally supports 999:99:99
+            if (!/^[+-]?(\d+[smh]?|(\d+:\d\d:|\d+:)?\d{2})$/.test(arg))
+            {
+                liberator.echoerr("E475: Invalid argument: " + arg);
+                return;
+            }
+
+            function ms(t, m) Math.abs(parseInt(t, 10) * { s: 1000, m: 60000, h: 3600000 }[m])
+
+            if (/:/.test(arg))
+            {
+                let [seconds, minutes, hours] = arg.split(":").reverse();
+                hours = hours || 0;
+                var value = ms(seconds, "s") + ms(minutes, "m") + ms(hours, "h");
+            }
+            else
+            {
+                if (!/[smh]/.test(arg.substr(-1)))
+                    arg += "s"; // default to seconds
+
+                value = ms(arg.substring(arg, arg.length - 1), arg.substr(-1));
+            }
+
+            if (/^[-+]/.test(arg))
+                arg[0] == "-" ? player.seekBackward(value) : player.seekForward(value)
+            else
+                player.seekTo(value)
+
+        },
+        { argCount: "1" });
+
+    // TODO: maybe :vol! could toggle mute on/off? --djk
     commands.add(["vol[ume]"],
         "Set the volume",
         function (args)
@@ -251,6 +279,7 @@ function Player() // {{{
             gMM.volumeControl.volume = value;
         },
 
+        // FIXME: can't be called from non-media tabs since 840e78
         play: function play()
         {
             // Check if there is any selection in place, else play first item of the visible view.
@@ -326,7 +355,19 @@ function Player() // {{{
             seek(interval, false);
         },
 
+        seekTo: function seekTo(position)
+        {
+            if (!gMM.playbackControl)
+                this.play();
+
+            let min = 0;
+            let max = gMM.playbackControl.duration - 5000; // TODO: 5s buffer like cmus desirable?
+
+            gMM.playbackControl.position = Math.min(Math.max(position, min), max);
+        },
+
         // FIXME: 10% ?
+        // I think just general increments of say 0.05 might be better --djk
         increaseVolume: function increaseVolume()
         {
             gMM.volumeControl.volume = gMM.volumeControl.volume * 1.1;
@@ -363,6 +404,7 @@ function Player() // {{{
 
             return tracksList;
         },
+
         // TODO: Use this for implementing "/" and "?". -ken
         searchTracks: function searchTracks(args)
         {
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index f4baae92..8344db4c 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -62,29 +62,29 @@ ________________________________________________________________________________
 section:Filtering{nbsp}the{nbsp}library[filter,filtering]
 
 |f| |:f| |:filter|
-||:f[ilter] [a][artist][a] [a]{album}[a] [a]{track}[a]|| +
+||:f[ilter] {artist} [a][album][a] [a][track][a]|| +
 ||f||
 ________________________________________________________________________________
-Filter and play tracks. If only [a][artist][a] is specified then all tracks for
-that artist are played in album order. If {album} is also specified then all
+Filter and play tracks. If only {artist} is specified then all tracks for that
+artist are played in album order. If [a][album][a] is also specified then all
 tracks for that album are played. A specific track can be specified with
-{track}.
+[a][track][a].
 ________________________________________________________________________________
 
 
 |F| |:F| |:Filter|
-||:F[ilter] {keywords}|| + 
+||:F[ilter] {keywords}|| +
 ||F||
 ________________________________________________________________________________
 Filter and show the tracks as a view. The tracks are filtered by the {keywords}
-provided as arguments. This text search applies over the default filter properties, 
-namely: Genre, Artist, and Album.
+provided as arguments. This text search applies over the default filter
+properties, namely: Genre, Artist, Album and Track.
 ________________________________________________________________________________
 
 section:Seeking{nbsp}to{nbsp}a{nbsp}track{nbsp}position[seeking]
 
 |h|
-||h||
+||[count]h||
 ________________________________________________________________________________
 Seek +10s.
 ________________________________________________________________________________
@@ -111,6 +111,18 @@ Seek -1m.
 ________________________________________________________________________________
 
 
+|:see]| |:seek|
+||:see[k] {[HH:]MM:SS]}|| +
+||:see[k] +{time[hms]} | -{time[hms]}|| +
+________________________________________________________________________________
+Seek to an absolute or relative position in a track. The position can be given
+in seconds (s), minutes (m), or hours (h). If the unit is not specified then
+seconds is assumed. The position is absolute unless the value is prefixed with
+"-" or "+".
+
+Positions may also be specified in [a][HH:]MM:SS[a] format.
+________________________________________________________________________________
+
 section:Adjusting{nbsp}the{nbsp}volume[volume]
 
 |+| |=|
@@ -129,11 +141,11 @@ ________________________________________________________________________________
 
 
 |:vol| |:volume|
-||:vol[ume][!] [a][value][a]|| +
-||:vol[ume][!] +{value} | -{value}|| +
+||:vol[ume] {value}|| +
+||:vol[ume] +{value} | -{value}|| +
 ________________________________________________________________________________
-Set the player volume. [a][value][a] can be an absolute value between 0 and
-100% or a relative value if prefixed with "-" or "+".
+Set the player volume. {value} can be an absolute value between 0 and 100% or a
+relative value if prefixed with "-" or "+".
 ________________________________________________________________________________
 
 section:Managing{nbsp}playlists[playlists]

From a442aa0798a660cc9282b23dfb91ae9883599d88 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 01:26:16 +1100
Subject: [PATCH 073/143] Add "i" mapping to select the current track.

---
 xulmus/content/player.js       | 4 ++++
 xulmus/locale/en-US/player.txt | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 6a5e6397..1a95e81a 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -55,6 +55,10 @@ function Player() // {{{
         ["F"], "Loads current view filtered by the keywords",
         function () { commandline.open(":", "Filter ", modes.EX); });
 
+    mappings.add([modes.PLAYER],
+        ["i"], "Select current track",
+        function () { gSongbirdWindowController.doCommand("cmd_find_current_track"); });
+
     mappings.add([modes.PLAYER],
         ["s"], "Toggle shuffle",
         function () { player.toggleShuffle(); });
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 8344db4c..023faea9 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -59,6 +59,13 @@ ________________________________________________________________________________
 Toggle repeat mode.
 ________________________________________________________________________________
 
+
+|i|
+||i||
+________________________________________________________________________________
+Select the currently playing track.
+________________________________________________________________________________
+
 section:Filtering{nbsp}the{nbsp}library[filter,filtering]
 
 |f| |:f| |:filter|

From b62527f8e6cbca9942d718b7e82743550829dfa3 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 01:52:14 +1100
Subject: [PATCH 074/143] Add "p" to 'guioptions' to show/hide the player
 controls.

Enable for now until the status bar is improved.
---
 xulmus/content/config.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 35bd1353..45bb0c51 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -33,12 +33,13 @@ const config = { //{{{
     //mainWindowID: "mainplayer",
     /*** optional options, there are checked for existence and a fallback provided  ***/
     features: ["bookmarks", "hints", "marks", "history", "quickmarks", "session", "tabs", "windows", "player"],
-    defaults: { guioptions: "rb" },
+    defaults: { guioptions: "mprb" }, // FIXME: "m" seems to be defaulting to on anyway
 
     guioptions: {
-        m: ["Menubar",      ["main-menubar"]],
-        T: ["Toolbar",      ["nav-bar"]],
-        B: ["Bookmark bar", ["PersonalToolbar"]]
+        m: ["Menubar",         ["main-menubar"]],
+        T: ["Toolbar",         ["nav-bar"]],
+        B: ["Bookmark bar",    ["PersonalToolbar"]], // FIXME: used/relevant?
+        p: ["Player controls", ["player_wrapper"]]
     },
 
     //get visualbellWindow() getBrowser().mPanelContainer,

From 4bfb4b7515f164feae70915fbf30a7b9e109292c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 02:13:14 +1100
Subject: [PATCH 075/143] Add <Left>/<Right> mappings for seeking.

These are the same as "h" and "l".
---
 xulmus/content/player.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 1a95e81a..1984ad56 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -68,12 +68,12 @@ function Player() // {{{
         function () { player.toggleRepeat(); });
 
     mappings.add([modes.PLAYER],
-        ["h"], "Seek -10s",
+        ["h", "<Left>"], "Seek -10s",
         function (count) { player.seekBackward(Math.max(1, count) * 10000); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
-        ["l"], "Seek +10s",
+        ["l", "<Right>"], "Seek +10s",
         function (count) { player.seekForward(Math.max(1, count) * 10000); },
         { flags: Mappings.flags.COUNT });
 

From ed502d5d61e661ed6bd14af15f308bcc4e9a6c5f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 02:21:24 +1100
Subject: [PATCH 076/143] Document player mode <Left>/<Right>.

---
 xulmus/locale/en-US/player.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 023faea9..8053d3c5 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -90,14 +90,14 @@ ________________________________________________________________________________
 
 section:Seeking{nbsp}to{nbsp}a{nbsp}track{nbsp}position[seeking]
 
-|h|
+|<Left>| |h|
 ||[count]h||
 ________________________________________________________________________________
 Seek +10s.
 ________________________________________________________________________________
 
 
-|l|
+|<Right>| |l|
 ||[count]l||
 ________________________________________________________________________________
 Seek -10s.

From 349c442eb558858f21ed6b8d7b869facb4d59a08 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 02:32:19 +1100
Subject: [PATCH 077/143] Fix 'showtabline'.

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

diff --git a/common/content/tabs.js b/common/content/tabs.js
index 6c4eb16d..0b19514f 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -689,9 +689,10 @@ function Tabs() //{{{
         {
             let tabStrip = null;
 
+            // FIXME: why is this app specific conditional code here?
             if (config.hostApplication == "Firefox")
                 tabStrip = getBrowser().mStrip.getElementsByClassName("tabbrowser-tabs")[0];
-            else if (config.hostApplication == "Thunderbird")
+            else if (/^(Thunderbird|Songbird)$/.test(config.hostApplication))
                 tabStrip = getBrowser().mStrip;
 
             return tabStrip;

From 98406ff211bfac968975b1acddc28792d82fb3f7 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 04:03:10 +1100
Subject: [PATCH 078/143] Fix :dialog entries.

---
 xulmus/content/config.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 45bb0c51..5eed716e 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -63,45 +63,58 @@ const config = { //{{{
                    ["XulmusLeavePre", "Triggered before exiting Xulmus, just before destroying each module"],
                    ["XulmusLeave",    "Triggered before exiting Xulmus"]],
 
+    // TODO: remove those which don't make sense, can't be provided.
     dialogs: [
         ["about",            "About Songbird",
-            function () { window.openDialog("chrome://browser/content/aboutDialog.xul", "_blank", "chrome,dialog,modal,centerscreen"); }],
+            function () { window.openDialog("chrome://songbird/content/xul/about.xul", "_blank", "chrome,dialog,modal,centerscreen"); }],
+        /*
         ["addbookmark",      "Add bookmark for the current page",
             function () { PlacesCommandHook.bookmarkCurrentPage(true, PlacesUtils.bookmarksRootId); }],
+        */
         ["addons",           "Manage Add-ons",
-            function () { window.BrowserOpenAddonsMgr(); }],
+            function () { SBOpenPreferences("paneAddons"); }],
+        /*
         ["bookmarks",        "List your bookmarks",
             function () { window.openDialog("chrome://browser/content/bookmarks/bookmarksPanel.xul", "Bookmarks", "dialog,centerscreen,width=600,height=600"); }],
+        */
         ["checkupdates",     "Check for updates",
             function () { window.checkForUpdates(); }],
         ["cleardata",        "Clear private data",
-            function () { Cc[GLUE_CID].getService(Ci.nsIBrowserGlue).sanitize(window || null); }],
+            function () {  Sanitizer.showUI(); }],
         ["cookies",          "List your cookies",
             function () { window.toOpenWindowByType("Browser:Cookies", "chrome://browser/content/preferences/cookies.xul", "chrome,dialog=no,resizable"); }],
         ["console",          "JavaScript console",
             function () { window.toJavaScriptConsole(); }],
+        /*
         ["customizetoolbar", "Customize the Toolbar",
             function () { window.BrowserCustomizeToolbar(); }],
+        */
         ["dominspector",     "DOM Inspector",
             function () { try { window.inspectDOMDocument(content.document); } catch (e) { liberator.echoerr("DOM Inspector extension not installed"); } }],
         ["downloads",        "Manage Downloads",
             function () { window.toOpenWindowByType("Download:Manager", "chrome://mozapps/content/downloads/downloads.xul", "chrome,dialog=no,resizable"); }],
+        /*
         ["history",          "List your history",
             function () { window.openDialog("chrome://browser/content/history/history-panel.xul", "History", "dialog,centerscreen,width=600,height=600"); }],
         ["import",           "Import Preferences, Bookmarks, History, etc. from other browsers",
             function () { window.BrowserImport(); }],
+        */
         ["openfile",         "Open the file selector dialog",
-            function () { window.BrowserOpenFileWindow(); }],
+            function () { SBFileOpen(); }],
+        /*
         ["pageinfo",         "Show information about the current page",
             function () { window.BrowserPageInfo(); }],
+        */
         ["pagesource",       "View page source",
             function () { window.BrowserViewSourceOfDocument(content.document); }],
         ["places",           "Places Organizer: Manage your bookmarks and history",
             function () { PlacesCommandHook.showPlacesOrganizer(ORGANIZER_ROOT_BOOKMARKS); }],
         ["preferences",      "Show Firefox preferences dialog",
             function () { window.openPreferences(); }],
+        /*
         ["printpreview",     "Preview the page before printing",
             function () { PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview); }],
+        */
         ["printsetup",       "Setup the page size and orientation before printing",
             function () { PrintUtils.showPageSetup(); }],
         ["print",            "Show print dialog",
@@ -382,6 +395,8 @@ const config = { //{{{
             },
             { argCount: "0" });
 
+        // TODO: service/content pane and right sidebar manipulation commands? --djk
+        /*
         // TODO: move sidebar commands to ui.js?
         commands.add(["sbcl[ose]"],
             "Close the sidebar window",
@@ -423,6 +438,7 @@ const config = { //{{{
                 completer: function (context) completion.sidebar(context),
                 literal: 0
             });
+        */
 
         commands.add(["winc[lose]", "wc[lose]"],
             "Close window",

From 8c495eb7ba53565c925432013fbe98b14f23ab01 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 04:13:15 +1100
Subject: [PATCH 079/143] Add Player mode :pmap commands.

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

diff --git a/common/content/mappings.js b/common/content/mappings.js
index 0f222d64..697396bb 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -257,8 +257,11 @@ function Mappings() //{{{
     addMapCommands("",  [modes.NORMAL], "");
     addMapCommands("c", [modes.COMMAND_LINE], "command line");
     addMapCommands("i", [modes.INSERT, modes.TEXTAREA], "insert");
+    // FIXME
     if (liberator.has("mail"))
         addMapCommands("m", [modes.MESSAGE], "message");
+    if (liberator.has("player"))
+        addMapCommands("p", [modes.PLAYER], "player");
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////

From 16eb0a11484be077b5f9b13f5fc0329353dd3059 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 12:44:00 +1100
Subject: [PATCH 080/143] Fix typo in LocationChange autocomd description.

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

diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index 1a37841a..ab6b0193 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -49,7 +49,7 @@ const config = { //{{{
                    ["DOMLoad",            "Triggered when a page's DOM content has fully loaded"],
                    ["DownloadPost",       "Triggered when a download has completed"],
                    ["Fullscreen",         "Triggered when the browser's fullscreen state changes"],
-                   ["LocationChange",     "Triggered when changing tabs or when naviagtion to a new location"],
+                   ["LocationChange",     "Triggered when changing tabs or when navigation to a new location"],
                    ["PageLoadPre",        "Triggered after a page load is initiated"],
                    ["PageLoad",           "Triggered when a page gets (re)loaded/opened"],
                    ["ShellCmdPost",       "Triggered after executing a shell command with :!cmd"],

From c6e675bbdd6cc13db34f4d2b74c3a9e6e0e9507b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 12:45:46 +1100
Subject: [PATCH 081/143] Fix typo in LocationChange autocomd description.

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

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 5eed716e..220b3a8c 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -55,7 +55,7 @@ const config = { //{{{
                    ["DOMLoad",        "Triggered when a page's DOM content has fully loaded"],
                    ["DownloadPost",   "Triggered when a download has completed"],
                    ["Fullscreen",     "Triggered when the browser's fullscreen state changes"],
-                   ["LocationChange", "Triggered when changing tabs or when naviagtion to a new location"],
+                   ["LocationChange", "Triggered when changing tabs or when navigation to a new location"],
                    ["PageLoadPre",    "Triggered after a page load is initiated"],
                    ["PageLoad",       "Triggered when a page gets (re)loaded/opened"],
                    ["ShellCmdPost",   "Triggered after executing a shell command with :!cmd"],

From d6238f84a43b848b86bca5ba55b465fad9bdba73 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 25 Mar 2009 01:58:39 +0000
Subject: [PATCH 082/143] Treat strings containing / as URLs

In lieu of getting proper hostname detection, allow localhost/ and other
similar URLs to work.
---
 common/content/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/content/util.js b/common/content/util.js
index 8ea3d22a..24a167e2 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -675,7 +675,7 @@ const util = { //{{{
 
             // Ok, not a valid proto. If it looks like URL-ish (foo.com/bar),
             // let Gecko figure it out.
-            if (/[.]/.test(url) && !/\s/.test(url) || /^[\w-.]+:\d+(?:\/|$)/.test(url))
+            if (/[.\/]/.test(url) && !/\s/.test(url) || /^[\w-.]+:\d+(?:\/|$)/.test(url))
                 return url;
 
             // TODO: it would be clearer if the appropriate call to

From d3642a67fa6106b2598b220c86880cf33877d659 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 15:31:24 +1100
Subject: [PATCH 083/143] Whitespace fixes.

---
 xulmus/content/bookmarks.js | 140 ++++++++++++++++++------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/xulmus/content/bookmarks.js b/xulmus/content/bookmarks.js
index 1e0ca0a0..03345b2a 100755
--- a/xulmus/content/bookmarks.js
+++ b/xulmus/content/bookmarks.js
@@ -57,7 +57,7 @@ function Bookmarks() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     const historyService   = PlacesUtils.history; //Cc["@mozilla.org/browser/global-history;1"].getService(Ci.nsIGlobalHistory);
-    const bookmarksService = PlacesUtils.bookmarks //Cc["@songbirdnest.com/servicepane/bookmarks;1"].getService(Ci.sbIBookmarks); 
+    const bookmarksService = PlacesUtils.bookmarks //Cc["@songbirdnest.com/servicepane/bookmarks;1"].getService(Ci.sbIBookmarks);
     const taggingService   = PlacesUtils.tagging //Cc["@mozilla.org/browser/tagging-service;1"].getService(Ci.nsITaggingService);
     const faviconService   = Cc["@mozilla.org/browser/favicon-service;1"].getService(Ci.nsIFaviconService);
 
@@ -571,14 +571,14 @@ function Bookmarks() //{{{
         getSuggestions: function getSuggestions(engineName, query, callback)
         {
             const responseType = "application/x-suggestions+json";
-            
+
             let engine = services.get("browserSearch").getEngineByAlias(engineName);
-            
+
             if (engine && engine.supportsResponseType(responseType))
                 var queryURI = engine.getSubmission(query, responseType).uri.spec;
             if (!queryURI)
                 return [];
-            
+
             function process(resp)
             {
                 let results = [];
@@ -594,7 +594,7 @@ function Bookmarks() //{{{
             }
 
             let resp = util.httpGet(queryURI, callback && process);
-            
+
             if (!callback)
                 return process(resp);
         },
@@ -620,74 +620,74 @@ function Bookmarks() //{{{
             // we need to make sure our custom alias have been set, even if the user
             // did not :open <tab> once before
             this.getSearchEngines();
- 
 
-            function getShortcutOrURI(aURL, aPostDataRef) 
-            {     
-                var shortcutURL = null;     
-                var keyword = aURL;     
-                var param = "";     
-                var searchService = Cc['@mozilla.org/browser/search-service;1'].getService(Ci.nsIBrowserSearchService);     
-                var offset = aURL.indexOf(" ");     
-                if (offset > 0) 
-                {         
-                    keyword = aURL.substr(0, offset);         
-                    param = aURL.substr(offset + 1);     
-                }     
-                if (!aPostDataRef) 
-                {         
-                    aPostDataRef = {};     
+
+            function getShortcutOrURI(aURL, aPostDataRef)
+            {
+                var shortcutURL = null;
+                var keyword = aURL;
+                var param = "";
+                var searchService = Cc['@mozilla.org/browser/search-service;1'].getService(Ci.nsIBrowserSearchService);
+                var offset = aURL.indexOf(" ");
+                if (offset > 0)
+                {
+                    keyword = aURL.substr(0, offset);
+                    param = aURL.substr(offset + 1);
                 }
-                var engine = searchService.getEngineByAlias(keyword);     
-                if (engine) 
-                {         
-                    var submission = engine.getSubmission(param, null);         
-                    aPostDataRef.value = submission.postData;         
-                    return submission.uri.spec;     
-                }     
-                [shortcutURL, aPostDataRef.value] = PlacesUtils.getURLAndPostDataForKeyword(keyword);     
-                if (!shortcutURL) 
-                {         
-                    return aURL;     
-                }     
-                var postData = "";     
-                if (aPostDataRef.value) 
-                {         
-                    postData = unescape(aPostDataRef.value);     
-                }     
-                if (/%s/i.test(shortcutURL) || /%s/i.test(postData)) 
-                {         
-                    var charset = "";         
-                    const re = /^(.*)\&mozcharset=([a-zA-Z][_\-a-zA-Z0-9]+)\s*$/;         
-                    var matches = shortcutURL.match(re);         
-                    if (matches) 
-                    {             
-                        [, shortcutURL, charset] = matches;         
-                    } 
-                    else 
-                    {             
-                        try 
-                        {                 
-                            charset = PlacesUtils.history.getCharsetForURI(makeURI(shortcutURL));             
-                        } catch (e) {             }         
-                    }         
-                    var encodedParam = "";         
-                    if (charset) 
-                    {             
-                        encodedParam = escape(convertFromUnicode(charset, param));         
-                    } else {             
-                        encodedParam = encodeURIComponent(param);         
-                    }         
-                    shortcutURL = shortcutURL.replace(/%s/g, encodedParam).replace(/%S/g, param);         
-                    if (/%s/i.test(postData)) 
-                    {            
-                        aPostDataRef.value = getPostDataStream(postData, param, encodedParam, "application/x-www-form-urlencoded");         
-                    }     
-                } else if (param) {         
-                    aPostDataRef.value = null;         
-                    return aURL;     
+                if (!aPostDataRef)
+                {
+                    aPostDataRef = {};
                 }
-                    return shortcutURL; 
+                var engine = searchService.getEngineByAlias(keyword);
+                if (engine)
+                {
+                    var submission = engine.getSubmission(param, null);
+                    aPostDataRef.value = submission.postData;
+                    return submission.uri.spec;
+                }
+                [shortcutURL, aPostDataRef.value] = PlacesUtils.getURLAndPostDataForKeyword(keyword);
+                if (!shortcutURL)
+                {
+                    return aURL;
+                }
+                var postData = "";
+                if (aPostDataRef.value)
+                {
+                    postData = unescape(aPostDataRef.value);
+                }
+                if (/%s/i.test(shortcutURL) || /%s/i.test(postData))
+                {
+                    var charset = "";
+                    const re = /^(.*)\&mozcharset=([a-zA-Z][_\-a-zA-Z0-9]+)\s*$/;
+                    var matches = shortcutURL.match(re);
+                    if (matches)
+                    {
+                        [, shortcutURL, charset] = matches;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            charset = PlacesUtils.history.getCharsetForURI(makeURI(shortcutURL));
+                        } catch (e) {             }
+                    }
+                    var encodedParam = "";
+                    if (charset)
+                    {
+                        encodedParam = escape(convertFromUnicode(charset, param));
+                    } else {
+                        encodedParam = encodeURIComponent(param);
+                    }
+                    shortcutURL = shortcutURL.replace(/%s/g, encodedParam).replace(/%S/g, param);
+                    if (/%s/i.test(postData))
+                    {
+                        aPostDataRef.value = getPostDataStream(postData, param, encodedParam, "application/x-www-form-urlencoded");
+                    }
+                } else if (param) {
+                    aPostDataRef.value = null;
+                    return aURL;
+                }
+                    return shortcutURL;
             }
             url = getShortcutOrURI(searchString, aPostDataRef);
             if (url == searchString)

From a3594e5ec371aadd870b6787f2a2b978953427cc Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 17:54:00 +1100
Subject: [PATCH 084/143] Use showtabline=2 as the default.

---
 xulmus/content/config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 220b3a8c..bb60f14e 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -465,6 +465,8 @@ const config = { //{{{
         ////////////////////// OPTIONS /////////////////////////////////////////////////
         /////////////////////////////////////////////////////////////////////////////{{{
 
+        options.get("showtabline").value = 2;
+
         options.add(["online"],
             "Set the 'work offline' option",
             "boolean", true,

From c5d201fdb1942210d1a1b1fc0929e10c34bf929d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 18:14:22 +1100
Subject: [PATCH 085/143] Reset the defaultValue for 'showtabline' as well.

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

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index bb60f14e..ddce2519 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -465,7 +465,8 @@ const config = { //{{{
         ////////////////////// OPTIONS /////////////////////////////////////////////////
         /////////////////////////////////////////////////////////////////////////////{{{
 
-        options.get("showtabline").value = 2;
+        let stal = options.get("showtabline");
+        stal.value = stal.defaultValue = 2;
 
         options.add(["online"],
             "Set the 'work offline' option",

From e21436d0dbac74abddfbb5e1d8d47dcd83ec5e2d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 19:15:45 +1100
Subject: [PATCH 086/143] Remove "B" from 'guioptions' as SB doesn't have a
 bookmarks bar.

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

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index ddce2519..ebf4345a 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -33,12 +33,11 @@ const config = { //{{{
     //mainWindowID: "mainplayer",
     /*** optional options, there are checked for existence and a fallback provided  ***/
     features: ["bookmarks", "hints", "marks", "history", "quickmarks", "session", "tabs", "windows", "player"],
-    defaults: { guioptions: "mprb" }, // FIXME: "m" seems to be defaulting to on anyway
+    defaults: { guioptions: "mprb" },
 
     guioptions: {
         m: ["Menubar",         ["main-menubar"]],
         T: ["Toolbar",         ["nav-bar"]],
-        B: ["Bookmark bar",    ["PersonalToolbar"]], // FIXME: used/relevant?
         p: ["Player controls", ["player_wrapper"]]
     },
 

From 3979d4b5ebf2742cfcb90c707dbd933e70a28083 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 19:21:14 +1100
Subject: [PATCH 087/143] Add several player related autocommands.

TrackChangePre, TrackChange, ViewChangePre, ViewChange, StreamStart,
StreamPause, StreamEnd and StreamStop
---
 xulmus/content/player.js | 59 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 1984ad56..7e419cf6 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -23,6 +23,51 @@ function Player() // {{{
         SBGetBrowser().mediaTab.mediaPage.highlightItem(_SBGetCurrentView().getIndexForItem(mediaItem));
     }
 
+    var mediaCoreListener = {
+        onMediacoreEvent: function (event)
+        {
+            switch (event.type)
+            {
+                case Ci.sbIMediacoreEvent.BEFORE_TRACK_CHANGE:
+                    liberator.log("Before track changed: " + event.data);
+                    autocommands.trigger("TrackChangePre", { track: event.data });
+                    break;
+                case Ci.sbIMediacoreEvent.TRACK_CHANGE:
+                    autocommands.trigger("TrackChange", { track: event.data });
+                    break;
+                case Ci.sbIMediacoreEvent.BEFORE_VIEW_CHANGE:
+                    liberator.log("Before view changed: " + event.data);
+                    autocommands.trigger("ViewChangePre", { view: event.data });
+                    break;
+                case Ci.sbIMediacoreEvent.VIEW_CHANGE:
+                    liberator.log("View changed: " + event.data);
+                    autocommands.trigger("ViewChange", { view: event.data });
+                    break;
+                case Ci.sbIMediacoreEvent.STREAM_START:
+                    liberator.log("Track started: " + event.data);
+                    autocommands.trigger("StreamStart", {});
+                    break;
+                case Ci.sbIMediacoreEvent.STREAM_PAUSE:
+                    liberator.log("Track paused: " + event.data);
+                    autocommands.trigger("StreamPause", {});
+                    break;
+                case Ci.sbIMediacoreEvent.STREAM_END:
+                    liberator.log("Track ended: " + event.data);
+                    autocommands.trigger("StreamEnd", {});
+                    break;
+                case Ci.sbIMediacoreEvent.STREAM_STOP:
+                    liberator.log("Track stopped: " + event.data);
+                    autocommands.trigger("StreamStop", {});
+                    break;
+            }
+        }
+    };
+
+    gMM.addListener(mediaCoreListener);
+    liberator.registerObserver("shutdown", function () {
+        gMM.removeListener(mediaCoreListener);
+    });
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -139,19 +184,21 @@ function Player() // {{{
             function (args)
             {
                 let library = LibraryUtils.mainLibrary;
-                let myView = LibraryUtils.createStandardMediaListView(LibraryUtils.mainLibrary, args.string);
-                if (myView.length == 0)
+                let view = LibraryUtils.createStandardMediaListView(LibraryUtils.mainLibrary, args.literalArg);
+
+                if (view.length == 0)
                     liberator.echoerr("No Tracks matching the keywords");
                 else
                 {
-                     SBGetBrowser().loadMediaList(LibraryUtils.mainLibrary, null, null, myView,
-                         "chrome://songbird/content/mediapages/filtersPage.xul");
+                     SBGetBrowser().loadMediaList(LibraryUtils.mainLibrary, null, null, view,
+                                                     "chrome://songbird/content/mediapages/filtersPage.xul");
                      // TODO: make this focusTrack work ?
-                     focusTrack(myView.getItemByIndex(0));
+                     focusTrack(view.getItemByIndex(0));
                 }
             },
             {
-                argCount: "+",
+                argCount: "1",
+                literal: 0
                 //completer: function (context, args) completion.tracks(context, args);
             });
 

From 49f3984ba0e3d5f870b3eca52a38a52e0fd4b746 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 19:55:50 +1100
Subject: [PATCH 088/143] Add new autocommands to config and update the help
 file.

---
 xulmus/content/config.js             | 16 ++++++++++++----
 xulmus/locale/en-US/autocommands.txt | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index ebf4345a..31034b2f 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -58,9 +58,17 @@ const config = { //{{{
                    ["PageLoadPre",    "Triggered after a page load is initiated"],
                    ["PageLoad",       "Triggered when a page gets (re)loaded/opened"],
                    ["ShellCmdPost",   "Triggered after executing a shell command with :!cmd"],
-                   ["XulmusEnter",    "Triggered after Xulmus starts"],
-                   ["XulmusLeavePre", "Triggered before exiting Xulmus, just before destroying each module"],
-                   ["XulmusLeave",    "Triggered before exiting Xulmus"]],
+                   ["TrackChangePre", "Triggered before a playing track is changed"],
+                   ["TrackChange",    "Triggered after a playing track has changed"],
+                   ["ViewChangePre",  "Triggered before a sequencer view is changed"],
+                   ["ViewChange",     "Triggered after a sequencer view is changed"],
+                   ["StreamStart",    "Triggered after a stream has started"],
+                   ["StreamPause",    "Triggered after a stream has paused"],
+                   ["StreamEnd",      "Triggered after a stream has ended"],
+                   ["StreamStop",     "Triggered after a stream has stopped"],
+                   ["XulmusEnter",    "Triggered after Songbird starts"],
+                   ["XulmusLeavePre", "Triggered before exiting Songbird, just before destroying each module"],
+                   ["XulmusLeave",    "Triggered before exiting Songbird"]],
 
     // TODO: remove those which don't make sense, can't be provided.
     dialogs: [
@@ -130,7 +138,7 @@ const config = { //{{{
 
     //TODO : Write intro.html and tutorial.html
     // they are sorted by relevance, not alphabetically
-    helpFiles: [ "player.html" ],
+    helpFiles: [ "player.html", "autocommands.html" ],
        /* "intro.html", "tutorial.html", "starting.html", "browsing.html",
         "buffer.html", "cmdline.html", "insert.html", "options.html",
         "pattern.html", "tabs.html", "hints.html", "map.html", "eval.html",
diff --git a/xulmus/locale/en-US/autocommands.txt b/xulmus/locale/en-US/autocommands.txt
index 36104b56..ab936a04 100755
--- a/xulmus/locale/en-US/autocommands.txt
+++ b/xulmus/locale/en-US/autocommands.txt
@@ -12,7 +12,7 @@ Execute commands automatically on events.
 
 [c]:au[tocmd][c] {event} {pat} {cmd}
 
-Add {cmd} to the list of commands Vimperator will execute on {event} for a URL matching {pat}:
+Add {cmd} to the list of commands Xulmus will execute on {event} for a URL matching {pat}:
 
 * [c]:autocmd[!][c] {events} {pat}: list/remove autocommands filtered by {events} and {pat}
 * [c]:autocmd[!][c] {events}: list/remove autocommands matching {events}
@@ -31,9 +31,17 @@ Available {events}:
 *PageLoadPre*        Triggered after a page load is initiated
 *PageLoad*           Triggered when a page gets (re)loaded/opened
 *ShellCmdPost*       Triggered after executing a shell command with [c]:![c]#{cmd}
-*VimperatorEnter*    Triggered after Firefox starts
-*VimperatorLeavePre* Triggered before exiting Firefox, just before destroying each module
-*VimperatorLeave*    Triggered before exiting Firefox
+*TrackChangePre*     Triggered before a playing track is changed
+*TrackChange*        Triggered after a playing track has changed
+*ViewChangePre*      Triggered before a sequencer view is changed
+*ViewChange*         Triggered after a sequencer view is changed
+*StreamStart*        Triggered after a stream has started
+*StreamPause*        Triggered after a stream has paused
+*StreamEnd*          Triggered after a stream has ended
+*StreamStop*         Triggered after a stream has stopped
+*XulmusEnter*        Triggered after Songbird starts
+*XulmusLeavePre*     Triggered before exiting Songbird, just before destroying each module
+*XulmusLeave*        Triggered before exiting Songbird
 --------------------------------------------------------------
 
 {pat} is a regular expression, use .* if you want to match all URLs.
@@ -53,6 +61,8 @@ The following keywords are available where relevant:
 *<file>*       The target destination of a download. Only for *DownloadPost*.
 *<state>*      The new fullscreen state. Only for *Fullscreen*.
 *<name>*       The color scheme name. Only for *ColorScheme*.
+*<view>*       The new sequencer view. Only for *ViewChangePre* and *ViewChange*.
+*<track>*      The new media track. Only for *TrackChangePre* and *TrackChange*.
 --------------------------------------------------------------
 
 ________________________________________________________________________________

From ace07cef56839f95c138a5faacda00c03140a8b2 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 20:13:08 +1100
Subject: [PATCH 089/143] Update options.txt for Xulmus.

---
 xulmus/content/config.js             |  2 +-
 xulmus/locale/en-US/autocommands.txt |  2 +-
 xulmus/locale/en-US/options.txt      | 68 ++++++++++++++--------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 31034b2f..89590b57 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -138,7 +138,7 @@ const config = { //{{{
 
     //TODO : Write intro.html and tutorial.html
     // they are sorted by relevance, not alphabetically
-    helpFiles: [ "player.html", "autocommands.html" ],
+    helpFiles: [ "player.html", "options.html", "autocommands.html" ],
        /* "intro.html", "tutorial.html", "starting.html", "browsing.html",
         "buffer.html", "cmdline.html", "insert.html", "options.html",
         "pattern.html", "tabs.html", "hints.html", "map.html", "eval.html",
diff --git a/xulmus/locale/en-US/autocommands.txt b/xulmus/locale/en-US/autocommands.txt
index ab936a04..c2af4a9a 100755
--- a/xulmus/locale/en-US/autocommands.txt
+++ b/xulmus/locale/en-US/autocommands.txt
@@ -26,7 +26,7 @@ Available {events}:
 *ColorScheme*        Triggered after a color scheme has been loaded
 *DOMLoad*            Triggered when a page's DOM content has fully loaded
 *DownloadPost*       Triggered when a download has completed
-*Fullscreen*         Triggered when the browser's fullscreen state changes
+*Fullscreen*         Triggered when the player's fullscreen state changes
 *LocationChange*     Triggered when changing tabs or when navigating to a new location
 *PageLoadPre*        Triggered after a page load is initiated
 *PageLoad*           Triggered when a page gets (re)loaded/opened
diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt
index a16aa9f6..9ad5f1de 100755
--- a/xulmus/locale/en-US/options.txt
+++ b/xulmus/locale/en-US/options.txt
@@ -2,7 +2,7 @@ HEADER
 
 |options| +
 
-Vimperator has a number of internal variables and switches which can be set to
+Xulmus has a number of internal variables and switches which can be set to
 achieve special effects. These options come in 5 forms:
 `------------`-----------------------------------------
 *boolean*    can only be on or off
@@ -155,35 +155,35 @@ Environment variables are expanded for path options like 'cdpath' and
 'runtimepath'. The variable notation is _$VAR_ (terminated by a non-word
 character) or _$\\{VAR}_. _%VAR%_ is also supported on Windows.
 
-section:Setting{nbsp}Firefox{nbsp}options[firefox-options,preferences]
+section:Setting{nbsp}Songbird{nbsp}options[songbird-options,preferences]
 
-Firefox options can be viewed and set with the following commands:
+Songbird options can be viewed and set with the following commands:
 
 |:prefs| |:preferences|
 ||:pref[erences]||
 ________________________________________________________________________________
-Show the Firefox preferences dialog. 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.
+Show the Songbird preferences dialog. You can change the player preferences
+from this dialog. Be aware that not all Songbird preferences work, because
+Xulmus overrides some key bindings and changes Songbird's GUI.
 ________________________________________________________________________________
 
 |:prefs!| |:preferences!|
 ||:pref[erences]!||
 ________________________________________________________________________________
-Opens about:config in the current tab where you can change advanced Firefox
+Opens about:config in the current tab where you can change advanced Songbird
 preferences.
 ________________________________________________________________________________
 
 |:set!| |:set-!|
 ||:se[t]! {preference}={value}|| +
 ________________________________________________________________________________
-Change any Firefox {preference} (those in the about:config window). You can also
-reset/delete those preferences with [c]:set! {preference}&[c].
+Change any Songbird {preference} (those in the about:config window). You can
+also reset/delete those preferences with [c]:set! {preference}&[c].
 ________________________________________________________________________________
 
 |overridden-preferences| +
 
-Vimperator sets several Firefox preferences at startup. If this is undesirable,
+Xulmus sets several Songbird preferences at startup. If this is undesirable,
 they can be changed to a different value in your RC file using
 [c]:set! {preference}={value}[c]
 
@@ -231,7 +231,7 @@ Items which are completed at the [c]:[tab]open[c] prompt. Available items:
 `---`--------------------------------------------------------------------------------
 *s* Search engines and keyword URLs
 *f* Local files
-*l* Firefox location bar entries (bookmarks and history sorted in an intelligent way)
+*l* Songbird location bar entries (bookmarks and history sorted in an intelligent way)
 *b* Bookmarks
 *S* Suggest engines
 -------------------------------------------------------------------------------------
@@ -253,7 +253,7 @@ schwarzenegger[c] will be exactly the same as [c]:open youtube arnold
 schwarzenegger[c]. Therefore, you need to add a keyword or search engine
 "youtube" first.
 
-If 'defsearch' is empty, then Firefox will always attempt to open the
+If 'defsearch' is empty, then Songbird will always attempt to open the
 raw [a][arg][a].
 ____
 
@@ -265,7 +265,7 @@ Set the external text editor.
 Sets the editor to run when [m]<C-i>[m] is pressed in INSERT and TEXTAREA
 modes.
 
-Warning: Vimperator will not behave correctly if the editor forks its own
+Warning: Xulmus will not behave correctly if the editor forks its own
 process, such as with gvim without the -f argument.
 ____
 
@@ -331,7 +331,7 @@ Show or hide certain GUI elements like the menu or toolbar. Supported characters
 `---`-----------
 *m* Menubar
 *T* Toolbar
-*B* Bookmark bar
+*p* Player controls
 *n* Tab number
 *N* Tab number over image
 *b* Bottom scrollbar
@@ -439,8 +439,8 @@ ____
 ||'insertmode' 'im'|| boolean (default: on)
 ____
 Use Insert mode as the default for text areas.
-Makes Vimperator work in a way that Insert mode is the default mode for text areas.
-Useful if you want to use Vimperator as a modeless editor, keeping the known Firefox interface for editing text areas.
+Makes Xulmus work in a way that Insert mode is the default mode for text areas.
+Useful if you want to use Xulmus as a modeless editor, keeping the known Songbird interface for editing text areas.
 ____
 
 
@@ -471,9 +471,9 @@ ____
 ||'loadplugins' 'lpl'|| boolean (default on)
 ____
 Load plugin scripts when starting up. When on, yet unloaded plugins are
-automatically loaded after the vimperatorrc file has been sourced. To
+automatically loaded after the xulmusrc file has been sourced. To
 load plugins earlier, use the [c]:loadplugins[c] command within the
-vimperatorrc.
+xulmusrc.
 ____
 
 
@@ -555,12 +555,12 @@ they always open in a new tab. Possible values:
 .---`------------------------------------------------------------------------------------------------
 *0*  Force to open in the current tab (Warning: this can stop some web sites from working correctly!)
 *1*  Always open in a new tab
-*2*  Open in a new window if it has a specific requested size (default in Firefox)
+*2*  Open in a new window if it has a specific requested size (default in Songbird)
 *3*  Always open in a new window
 *4*  Open in the same tab unless it has a specific requested size
 -----------------------------------------------------------------------------------------------------
 
-Note: This option does not change the popup blocker of Firefox in any way.
+Note: This option does not change the popup blocker of Songbird in any way.
 ____
 
 
@@ -570,7 +570,7 @@ ____
 Speed up first time history/bookmark completion
 
 History access can be quite slow for a large history.
-Vimperator maintains a cache to speed it up significantly on subsequent access.
+Xulmus maintains a cache to speed it up significantly on subsequent access.
 In order to also speed up first time access, it is cached at startup, if this option is set (recommended).
 ____
 
@@ -587,23 +587,23 @@ link elements are those defined by 'hinttags'.
 ____
 
 
-|$VIMPERATOR_RUNTIME|
+|$XULMUS_RUNTIME|
 |\'rtp'| |\'runtimepath'|
 ||'runtimepath' 'rtp'|| stringlist
 ____
-(default: _$VIMPERATOR_RUNTIME_ or Unix, Mac: "\~/.vimperator", Windows: "\~/vimperator")
+(default: _$XULMUS_RUNTIME_ or Unix, Mac: "\~/.xulmus", Windows: "\~/xulmus")
 
 List of directories searched for runtime files: +
 colors/ +
 macros/ +
 plugin/ +
 
-Example: [c]:set runtimepath=\~/myvimperator,\~/.vimperator[c] +
-This will search for plugins in both "\~/myvimperator/plugin" and
-"\~/.vimperator/plugin"
+Example: [c]:set runtimepath=\~/myxulmus,\~/.xulmus[c] +
+This will search for plugins in both "\~/myxulmus/plugin" and
+"\~/.xulmus/plugin"
 
-On startup, if the environment variable _$VIMPERATOR_RUNTIME_ does not
-exist, Vimperator will set it to match this value.
+On startup, if the environment variable _$XULMUS_RUNTIME_ does not
+exist, Xulmus will set it to match this value.
 ____
 
 
@@ -690,13 +690,13 @@ ____
 
 
 |\'titlestring'|
-||'titlestring'|| string (default: "Vimperator")
+||'titlestring'|| string (default: "Xulmus")
 ____
-Change the title of the browser window.
-Vimperator changes the browser title from "Title of web page - Mozilla Firefox" to
-"Title of web page - Vimperator". +
+Change the title of the player window.
+Xulmus changes the player title from "Songbird" to
+"Title of tab - Xulmus". +
 If you don't like that, you can restore it with:
-[c]:set titlestring=Mozilla\ Firefox[c].
+[c]:set titlestring=Songbird[c].
 ____
 
 
@@ -725,7 +725,7 @@ ____
 ||'verbose' 'vbs'|| number (default: 1)
 ____
 Define which info messages are displayed.
-When bigger than zero, Vimperator will give messages about what it is doing.
+When bigger than zero, Xulmus will give messages about what it is doing.
 These can be viewed at any time with the [c]:messages[c] command. The highest
 value is 15, being the most verbose mode.
 

From 3fad7406d201be3c2d3ebe49eda73cbc4ce0386f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 23:24:45 +1100
Subject: [PATCH 090/143] Use a green tilde for the Xulmus icon.

---
 xulmus/skin/icon.png | Bin 514 -> 465 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/xulmus/skin/icon.png b/xulmus/skin/icon.png
index e821ed66aa94c38f809f64142d69b2252bb7a622..3d16d3fc225a8046756f9e96ba0f839557abc2af 100755
GIT binary patch
delta 379
zcmV->0fhd71knSKUw;D`3>G>-+7N>P00B`+L_t(o!|m3wOB_)U$MMe|Vn8COWw5i*
zLIM^Bn;2rFjR=N-kjCn;F@J!awHAVvL?oqufMRbUXklY3L;{8su@E!}Nj#fDmgCMW
zc)KUE-{vi|!<*lmc{4mpo*3^ii+}imo+f^as9~nn0{UZJkADE04SWXi8(Vo~Ac^%Q
z&O*dQ>VF50@D1I0mt!&noT4ji%Tb<jbQW<ZzJ`cZyulx=;6*B1xzdZD_>1p2iQt9u
zA+k`zSgSX$WbnC8eNPvC`aYcF5WnIMj1(zg8&?>>rzpd5v}5kfMZjvxwiC9cyo0~O
z1$G-u%1hi}sC1Q+ubw@OVmR6`O%)qBz+2p=M8D1u^E}%5ezexJfGK=z5FEZldEVnQ
z*1|r3`3wT~(*jCLO4?52K~z(#^J?ywJnmtVJQz6J4v!L0X?F=a{(Gv2vXT_@E-ZQ8
Z+yP*`Kx7U@%8vj5002ovPDHLkV1gaNt>gdz

delta 429
zcmV;e0aE_a1A+vQUw;A{5;H0^PrpF`00DwYL_t(o!|l{PYgADXhw<MAUqBSpQql!c
zQ3QpEjfz@m69h#NY^*{W^8xI%)xwub3}Pj*S1jye2xy3nmVzQ~u!x0VLLf0?;UI@)
z7q+-}wYU#l&SCCw=6`193=RJor*IL!u!x;K{H`N#p=trcxqm*$08?Fj_F)B&>&QSW
z*X{V6BF+^5H{mTlVMpENIF|xGVq4m7W_eCx%OHB<Ns73GV_3s&Y%Q`?E4%Ow>-d8A
z8GN8z$}9wqSAF<UA3n>)er(XU-;FljU@3dx$RGtw<0nRNHOufWpJVM@$$;a9?Rna6
z)E#^ezT-ugNq_kRtJq)V<m==mMsX;gVaYfiVh$&;QHVa=N6dCU=f9)1lL?&1<u1YD
zQI_X4CUH0IBe>RwfSFQ2Lqo$qr^g_Qy*QXdW`S0_hu<)*uNCTvQDT;e;@co*h)LoA
zu{r&o5mOZ>BwiEi#QdMb<0-M&A!x1G->O=`ed1_`Z6=5~OWY$q5KF`>Vyx-lhAQ|C
X4wHD0h+54g00000NkvXXu0mjfsISS&


From 683d569eb286be62582f3f9ad149fb8f3500c74c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 26 Mar 2009 00:25:59 +1100
Subject: [PATCH 091/143] Remove the unwanted SB margin from the command line.

---
 common/skin/liberator.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/skin/liberator.css b/common/skin/liberator.css
index 48c22c33..a5857cd5 100644
--- a/common/skin/liberator.css
+++ b/common/skin/liberator.css
@@ -141,13 +141,17 @@ statusbarpanel {
 }
 
 #liberator-commandline-prompt {
+    background-color: inherit;
     margin: 0px;
     padding: 0px;
-    background-color: inherit;
 }
 #liberator-commandline-command {
     background-color: inherit;
     color: inherit;
+    margin: 0px;
+}
+#liberator-message {
+    margin: 0px;
 }
 
 #sidebar {

From a5b6ec3478758bbed5f636c8d9d8f33638c718c6 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 26 Mar 2009 01:04:02 +1100
Subject: [PATCH 092/143] Refactor player#togglePlayPause.

---
 xulmus/TODO                 | 2 ++
 xulmus/content/bookmarks.js | 3 ++-
 xulmus/content/player.js    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index 1a85e4cd..1585a2fe 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -6,6 +6,8 @@ BUGS:
   - SB doesn't support tab-undo yet so :undo and "u" etc don't work
   - :tabduplicate
   - :back/H, :forward,L
+  - :open songbird-internal-search searchString
+    Is this workable anyway? --djk
 
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
diff --git a/xulmus/content/bookmarks.js b/xulmus/content/bookmarks.js
index 03345b2a..9f73121f 100755
--- a/xulmus/content/bookmarks.js
+++ b/xulmus/content/bookmarks.js
@@ -621,7 +621,6 @@ function Bookmarks() //{{{
             // did not :open <tab> once before
             this.getSearchEngines();
 
-
             function getShortcutOrURI(aURL, aPostDataRef)
             {
                 var shortcutURL = null;
@@ -689,7 +688,9 @@ function Bookmarks() //{{{
                 }
                     return shortcutURL;
             }
+
             url = getShortcutOrURI(searchString, aPostDataRef);
+
             if (url == searchString)
                 url = null;
 
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 7e419cf6..670d93b1 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -365,7 +365,7 @@ function Player() // {{{
         togglePlayPause: function togglePlayPause()
         {
             gSongbirdWindowController.doCommand("cmd_control_playpause");
-            SBGetBrowser().mediaTab.mediaPage.highlightItem(_SBGetCurrentView().getIndexForItem(gMM.sequencer.currentItem));
+            focusTrack(gMM.sequencer.currentItem);
         },
 
         toggleShuffle: function toggleShuffle()

From bda0c5bda592560fb131c832259be3ab6edfb3e1 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 26 Mar 2009 02:48:55 +0000
Subject: [PATCH 093/143] Fix #180. User can no-longer interrupt macros.

Buffers any keystrokes recieved during a macro expansion and plays them
after it has finished.
---
 common/content/events.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 5e1b7e02..3c58afc2 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -898,6 +898,7 @@ function Events() //{{{
 
             let wasFeeding = this.feedingKeys;
             this.feedingKeys = true;
+            this.duringFeed = this.duringFeed || "";
             let wasSilent = commandline.silent;
             if (silent)
                 commandline.silent = silent;
@@ -993,6 +994,15 @@ function Events() //{{{
                 this.feedingKeys = wasFeeding;
                 if (silent)
                     commandline.silent = wasSilent;
+
+                if (this.duringFeed != "")
+                {
+                    //Create a scalar constant for closure.
+                    let duringFeed = this.duringFeed;
+                    this.duringFeed = "";
+
+                    setTimeout(function () events.feedkeys(duringFeed, false, false, true), 0);
+                }
             }
             return i == keys.length;
         },
@@ -1370,9 +1380,9 @@ function Events() //{{{
             // we can differentiate between a recorded <C-c>
             // interrupting whatever it's started and a real <C-c>
             // interrupting our playback.
-            if (events.feedingKeys)
+            if (events.feedingKeys && !event.isMacro)
             {
-                if (key == "<C-c>" && !event.isMacro)
+                if (key == "<C-c>")
                 {
                     events.feedingKeys = false;
                     if (modes.isReplaying)
@@ -1384,6 +1394,13 @@ function Events() //{{{
                     event.stopPropagation();
                     return true;
                 }
+                else
+                {
+                    events.duringFeed += key;
+                    event.preventDefault();
+                    event.stopPropagation();
+                    return true;
+                }
             }
 
             let stop = true; // set to false if we should NOT consume this event but let Firefox handle it

From 4282b07d77372c549efd6ec8209d7a6be2aaacdb Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 26 Mar 2009 03:11:17 +0000
Subject: [PATCH 094/143] Fix uploading of files by relative path name.

Use io.getFile(path).path instead of just path in order to create an
absolute path.
---
 common/content/buffer.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 4cd9fdeb..a9cb4831 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1021,7 +1021,16 @@ function Buffer() //{{{
             }
             else if (elemTagName == "input" && elem.getAttribute('type').toLowerCase() == "file")
             {
-                commandline.input("Upload file: ", function (file) elem.value = file, {completer: completion.file, default: elem.value});
+                commandline.input("Upload file: ", function (path) 
+                    {
+                        let file = io.getFile(path);
+
+                        if (!file.exists())
+                            return liberator.beep();
+
+                        elem.value = file.path;
+                    }
+                    , {completer: completion.file, default: elem.value});
                 return;
             }
 
@@ -1131,7 +1140,16 @@ function Buffer() //{{{
             }
             else if (localName == "input" && elem.getAttribute('type').toLowerCase() == "file")
             {
-                commandline.input("Upload file: ", function (file) elem.value = file, {completer: completion.file, default: elem.value});
+                commandline.input("Upload file: ", function (path) 
+                    {
+                        let file = io.getFile(path);
+
+                        if (!file.exists())
+                            return liberator.beep();
+
+                        elem.value = file.path;
+                    }
+                    , {completer: completion.file, default: elem.value});
                 return;
             }
 

From 702f8f9a3eceeb9729f95ac6a793c45c72eed85e Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Thu, 26 Mar 2009 09:34:10 +0200
Subject: [PATCH 095/143] Doc fixes (thanks Xie&Tian)

---
 vimperator/AUTHORS                   |  2 +-
 vimperator/locale/en-US/browsing.txt |  2 +-
 vimperator/locale/en-US/buffer.txt   | 26 +++++++++++++-------------
 vimperator/locale/en-US/eval.txt     |  2 +-
 vimperator/locale/en-US/gui.txt      |  4 ++--
 vimperator/locale/en-US/index.txt    |  8 ++++----
 vimperator/locale/en-US/map.txt      |  2 +-
 vimperator/locale/en-US/marks.txt    |  4 ++--
 vimperator/locale/en-US/options.txt  | 10 +++++-----
 vimperator/locale/en-US/repeat.txt   |  2 +-
 vimperator/locale/en-US/tutorial.txt |  2 +-
 vimperator/locale/en-US/various.txt  |  6 +++---
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/vimperator/AUTHORS b/vimperator/AUTHORS
index 7f809a95..d2ec10d5 100644
--- a/vimperator/AUTHORS
+++ b/vimperator/AUTHORS
@@ -19,7 +19,7 @@ Inactive/former developers:
 
 Patches (in no special order):
   * Ruud Grosmann ('followhints' option)
-  * Xie&Tian (multibyte support for hints)
+  * Xie&Tian (multibyte support for hints, doc fixes)
   * Juergen Descher
   * Kazuo (count support for ctrl-^)
   * Daniel Schaffrath (;b support)
diff --git a/vimperator/locale/en-US/browsing.txt b/vimperator/locale/en-US/browsing.txt
index c2a7dbba..95a4cbe4 100644
--- a/vimperator/locale/en-US/browsing.txt
+++ b/vimperator/locale/en-US/browsing.txt
@@ -51,7 +51,7 @@ Each token is analyzed and in this order:
    to set a custom name, you can change it with [c]:dialog searchengines[c].
 3. Opened with the default search engine or keyword (specified with the
    'defsearch' option) if the first word is no search engine ([c]:open linus
-   torvalds[c] opens a Google search for linux torvalds).
+   torvalds[c] opens a Google search for linus torvalds).
 4. Passed directly to Firefox in all other cases ([c]:open www.osnews.com,
    www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new
    background tab).
diff --git a/vimperator/locale/en-US/buffer.txt b/vimperator/locale/en-US/buffer.txt
index 95d6bab0..0fe91f6e 100644
--- a/vimperator/locale/en-US/buffer.txt
+++ b/vimperator/locale/en-US/buffer.txt
@@ -123,6 +123,16 @@ set).
 ________________________________________________________________________________
 
 
+|<Right>| |l| +
+||[count]l||
+________________________________________________________________________________
+Scroll document to the right. If [count] is specified then move [count] times
+as much to the right. +
+If the document cannot scroll more, a beep is emitted (unless 'visualbell' is
+set).
+________________________________________________________________________________
+
+
 |<C-d>| +
 ||[count]<C-d>||
 ________________________________________________________________________________
@@ -141,16 +151,6 @@ first set to this value.
 ________________________________________________________________________________
 
 
-|<Right>| |l| +
-||[count]l||
-________________________________________________________________________________
-Scroll document to the right. If [count] is specified then move [count] times
-as much to the right. +
-If the document cannot scroll more, a beep is emitted (unless 'visualbell' is
-set).
-________________________________________________________________________________
-
-
 |<S-Space>| |<PageUp>| |<C-b>| +
 ||[count]<C-b>||
 ________________________________________________________________________________
@@ -235,7 +235,7 @@ default zoom levels are 30%, 50%, 67%, 80%, 90%, 100%, 110%, 120%, 133%, 150%,
 
 The available zoom range can be changed by setting the
 \'http://kb.mozillazine.org/Zoom.minPercent[zoom.minPercent]' and
-\'http://kb.mozillazine.org/Zoom.minPercent[zoom.maxPercent]' Firefox
+\'http://kb.mozillazine.org/Zoom.maxPercent[zoom.maxPercent]' Firefox
 preferences. The zoom levels can be changed using the
 \'http://kb.mozillazine.org/Toolkit.zoomManager.zoomValues[toolkit.ZoomManager.zoomLevels]'
 preference.
@@ -274,7 +274,7 @@ ________________________________________________________________________________
 |zz| +
 ||[count]zz||
 ________________________________________________________________________________
-Set text zoom value of current web page. Zoom value can be between 30 and 300%.
+Set text zoom value of current web page. Zoom value can be between 30% and 300%.
 If it is omitted, text zoom is reset to 100%.
 ________________________________________________________________________________
 
@@ -320,7 +320,7 @@ ________________________________________________________________________________
 ||:zo[om][!] +{value} | -{value}|| +
 ________________________________________________________________________________
 Set zoom value of current web page. [a][value][a] can be an absolute value
-between 30 and 300% or a relative value if prefixed with "-" or "+". If
+between 30% and 300% or a relative value if prefixed with "-" or "+". If
 [a][value][a] is omitted, zoom is reset to 100%.
 
 Normally this command operates on the text zoom, if used with [!] it operates
diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt
index 17c71dda..bbc0d5ba 100644
--- a/vimperator/locale/en-US/eval.txt
+++ b/vimperator/locale/en-US/eval.txt
@@ -70,7 +70,7 @@ ________________________________________________________________________________
 ________________________________________________________________________________
 Sets or lists a variable. Sets the variable {var-name} to the value of the
 expression {expr1}. If no expression is given, the value of the variable is
-displayed.Without arguments, displays a list of all variables.
+displayed. Without arguments, displays a list of all variables.
 ________________________________________________________________________________
 
 
diff --git a/vimperator/locale/en-US/gui.txt b/vimperator/locale/en-US/gui.txt
index 4da826c5..bec1f78b 100644
--- a/vimperator/locale/en-US/gui.txt
+++ b/vimperator/locale/en-US/gui.txt
@@ -20,7 +20,7 @@ ________________________________________________________________________________
 |:addo| |:addons| +
 ||:addo[ns]||
 ________________________________________________________________________________
-Show available Browser Extensions and Themes.
+Show available browser Extensions and Themes.
 You can add/remove/disable browser extensions from this dialog.
 Be aware that not all Firefox extensions work, because Vimperator overrides
 some key bindings and changes Firefox's GUI.
@@ -34,7 +34,7 @@ Open a Firefox dialog.
 
 Available dialogs:
 `------------------`-----------------------------------
-*about*            About Firefox
+*about*            About Mozilla Firefox
 *addbookmark*      Add bookmark for the current page
 *addons*           Manage Add-ons
 *bookmarks*        List your bookmarks
diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt
index 5a6a2fbb..085792e3 100644
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -170,7 +170,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:delmarks[c]|| Delete the specified marks +
 ||[c]:delqmarks[c]|| Delete the specified QuickMarks +
 ||[c]:delstyle[c]|| Delete any matching styles +
-||[c]:dialog[c]|| Open a undefined dialog +
+||[c]:dialog[c]|| Open a Firefox dialog +
 ||[c]:doautoall[c]|| Apply the autocommands matching the specified URL to all buffers +
 ||[c]:doautocmd[c]|| Apply the autocommands matching the specified URL to the current buffer +
 ||[c]:downloads[c]|| Show progress of current downloads +
@@ -217,11 +217,11 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:qmark[c]|| Mark a URL with a letter for quick access +
 ||[c]:qmarks[c]|| Show all QuickMarks +
 ||[c]:quit[c]|| Quit current tab +
-||[c]:quitall[c]|| Quit undefined +
+||[c]:quitall[c]|| Quit Vimperator +
 ||[c]:redraw[c]|| Redraw the screen +
 ||[c]:reload[c]|| Reload current page +
 ||[c]:reloadall[c]|| Reload all tab pages +
-||[c]:restart[c]|| Force undefined to restart +
+||[c]:restart[c]|| Force the browser to restart +
 ||[c]:runtime[c]|| Source the specified file from each directory in 'runtimepath' +
 ||[c]:saveas[c]|| Save current document to disk +
 ||[c]:sbclose[c]|| Close the sidebar window +
@@ -261,7 +261,7 @@ section:Options[option-index]
 
 ||'activate'|| Define when tabs are automatically activated +
 ||'cdpath'|| List of directories searched when executing [c]:cd[c] +
-||'complete'|| Items which are completed at the [c]:[tab]open prompt[c] +
+||'complete'|| Items which are completed at the [c]:[tab]open[c] prompt +
 ||'defsearch'|| Set the default search engine +
 ||'editor'|| Set the external text editor +
 ||'errorbells'|| Ring the bell when an error message is displayed +
diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt
index 6dce047a..b1073ffe 100644
--- a/vimperator/locale/en-US/map.txt
+++ b/vimperator/locale/en-US/map.txt
@@ -346,7 +346,7 @@ Custom completion
 Custom completion can be provided by specifying the "custom,{func}" argument to
 -complete. The {func} is called with two arguments, a completion context, and
 an object describing the command's arguments. It should set the context's
-\'completions' property, or return an object, with \'start' and \'items'
+\'completions' property, or return an object, with \'items' and \'start'
 properties, describing the completions and where the replacement is to start.
 
 *start* is the index into the word being completed at which the returned values
diff --git a/vimperator/locale/en-US/marks.txt b/vimperator/locale/en-US/marks.txt
index 837268be..7a6e1239 100644
--- a/vimperator/locale/en-US/marks.txt
+++ b/vimperator/locale/en-US/marks.txt
@@ -80,7 +80,7 @@ section:History[history]
 ||[count]<C-o>||
 ________________________________________________________________________________
 Go to an older position in the jump list. The jump list is just the browser
-history for now.
+history for now. If [count] is specified go back [count] pages.
 ________________________________________________________________________________
 
 
@@ -88,7 +88,7 @@ ________________________________________________________________________________
 ||[count]<C-i>||
 ________________________________________________________________________________
 Go to a newer position in the jump list. The jump list is just the browser
-history for now.
+history for now. If [count] is specified go forward [count] pages.
 ________________________________________________________________________________
 
 
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index bf042502..c434cb79 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -252,7 +252,7 @@ Sets the default search engine. The default search engine name is used in the
 [c]:[tab]open [arg][c] command if [a][arg][a] neither looks like a URL or like
 a specified search engine/keyword.
 
-This means, it you set 'defsearch' to "youtube", then [c]:open arnold
+This means, if you set 'defsearch' to "youtube", then [c]:open arnold
 schwarzenegger[c] will be exactly the same as [c]:open youtube arnold
 schwarzenegger[c]. Therefore, you need to add a keyword or search engine
 "youtube" first.
@@ -472,7 +472,7 @@ ____
 
 
 |\'nolpl'| |\'lpl'| |\'noloadplugins'| |\'loadplugins'|
-||'loadplugins' 'lpl'|| boolean (default on)
+||'loadplugins' 'lpl'|| boolean (default: on)
 ____
 Load plugin scripts when starting up. When on, yet unloaded plugins are
 automatically loaded after the vimperatorrc file has been sourced. To
@@ -527,7 +527,7 @@ ____
 
 
 |\'noonline'| |\'online'|
-||'online'|| boolean (default on)
+||'online'|| boolean (default: on)
 ____
 Show and set the \'work offline' behavior.
 ____
@@ -571,7 +571,7 @@ ____
 |\'nopreload'| |\'preload'|
 ||'preload' 'nopreload'|| boolean (default: on)
 ____
-Speed up first time history/bookmark completion
+Speed up first time history/bookmark completion.
 
 History access can be quite slow for a large history.
 Vimperator maintains a cache to speed it up significantly on subsequent access.
@@ -751,7 +751,7 @@ ____
 |\'wildcase'| |\'wic'|
 ||'wildcase' 'wic'|| string (default: "smart")
 ____
-Defines how completions are matched with regard to character case.
+Defines how completions are matched with regard to character case. Possible values:
 
 `---------------`------------------------
 "smart"		Case is significant when capital letters are typed
diff --git a/vimperator/locale/en-US/repeat.txt b/vimperator/locale/en-US/repeat.txt
index 975cbea7..8d1adb3a 100644
--- a/vimperator/locale/en-US/repeat.txt
+++ b/vimperator/locale/en-US/repeat.txt
@@ -132,7 +132,7 @@ section:Profiling[profile,profiling]
 |:time|
 ||:[count]time[!] {code|:command}|| +
 ________________________________________________________________________________
-Profile a piece of code or a command. Run {code} [count] times (default 1)
+Profile a piece of code or a command. Run {code} [count] times (default: 1)
 and returns the elapsed time. {code} is always passed to JavaScript's eval(),
 which might be slow, so take the results with a grain of salt.
 
diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt
index 21b5e285..f85af34f 100644
--- a/vimperator/locale/en-US/tutorial.txt
+++ b/vimperator/locale/en-US/tutorial.txt
@@ -57,7 +57,7 @@ Similarly, help on configurable options is available with [c]:help
 '{option_name}'[c]. (Note the single quotes around the option name as in Vim.)
 Information on all available options is, predictably, [c]:help options[c].
 
-and you can find out about the [m]gt[m] and [m]gT[m] mapping with
+And you can find out about the [m]gt[m] and [m]gT[m] mapping with
 
 \{nbsp}[c]:help gt<CR>[c] +
 \{nbsp}[c]:help gT<CR>[c]
diff --git a/vimperator/locale/en-US/various.txt b/vimperator/locale/en-US/various.txt
index 79d485dc..7110495f 100644
--- a/vimperator/locale/en-US/various.txt
+++ b/vimperator/locale/en-US/various.txt
@@ -11,9 +11,9 @@ ________________________________________________________________________________
 
 |<C-l>| |CTRL-L| |:redr| |:redraw| +
 ||:redr[aw]||
-____
+________________________________________________________________________________
 Redraws the screen. Useful to update the screen halfway executing a script or function.
-____
+________________________________________________________________________________
 
 |:norm| |:normal|
 ||:norm[al][!] {commands}|| +
@@ -54,7 +54,7 @@ ________________________________________________________________________________
 Open help window. The default page, as specified by 'helpfile' is shown unless
 [a][subject][a] is specified. If you need help for a specific topic, try
 [c]:help overview[c].
-____________________________________________________________________________
+________________________________________________________________________________
 
 
 |:exu| |:exusage| +

From 59c1eaa4c80d8650954fa56dd3b646d3a703bedd Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Thu, 26 Mar 2009 21:54:28 +1100
Subject: [PATCH 096/143] Add a :mediaview command to change media views.

---
 common/content/completion.js |   8 +++
 xulmus/TODO                  |   1 +
 xulmus/content/player.js     | 122 +++++++++++++++++++++++++----------
 3 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index 7596362f..0494759b 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1664,6 +1664,14 @@ function Completion() //{{{
             context.completions = marks.all;
         },
 
+        mediaView: function mediaView(context)
+        {
+            context.title = ["Media View", "URL"];
+            context.anchored = false;
+            context.keys = { text: "contentTitle", description: "contentUrl" };
+            context.completions = player.getMediaPages();
+        },
+
         menuItem: function menuItem(context)
         {
             context.title = ["Menu Path", "Label"];
diff --git a/xulmus/TODO b/xulmus/TODO
index 1585a2fe..867a6947 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -8,6 +8,7 @@ BUGS:
   - :back/H, :forward,L
   - :open songbird-internal-search searchString
     Is this workable anyway? --djk
+  - <C-^> is off by one when alternating with the media tab
 
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 670d93b1..e3710cf4 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -11,6 +11,9 @@ function Player() // {{{
     // Get the focus to the visible playlist first
     //window._SBShowMainLibrary();
 
+    const pageService = Components.classes["@songbirdnest.com/Songbird/MediaPageManager;1"]
+                                  .getService(Components.interfaces.sbIMediaPageManager);
+
     // interval (milliseconds)
     function seek(interval, direction)
     {
@@ -202,6 +205,41 @@ function Player() // {{{
                 //completer: function (context, args) completion.tracks(context, args);
             });
 
+    commands.add(["load"],
+        "Load a playlist",
+        function (args)
+        {
+            let arg = args.literalArg;
+
+            if (arg)
+            {
+                // load the selected playlist/smart playlist
+                let playlists = player.getPlaylists();
+
+                for ([i, list] in Iterator(playlists))
+                {
+                    if (util.compareIgnoreCase(arg, list.name) == 0)
+                    {
+                        SBGetBrowser().loadMediaList(playlists[i]);
+                        focusTrack(_SBGetCurrentView().getItemByIndex(0));
+                        return;
+                    }
+                }
+
+                liberator.echoerr("E475: Invalid argument: " + arg);
+            }
+            else
+            {
+                // load main library if there are no args
+                _SBShowMainLibrary();
+            }
+        },
+        {
+            argCount: "?",
+            completer: function(context, args) completion.playlist(context, args),
+            literal: 0
+        });
+
     // TODO: better off as a single command (:player play) or cmus compatible (:player-play)? --djk
     commands.add(["playerp[lay]"],
         "Play track",
@@ -260,6 +298,41 @@ function Player() // {{{
         },
         { argCount: "1" });
 
+    commands.add(["mediav[iew]"],
+        "Change the current media view",
+        function (args)
+        {
+            // FIXME: is this a SB restriction? --djk
+            if (!gBrowser.currentMediaPage)
+            {
+                liberator.echoerr("Exxx: Can only set the media view from the media tab"); // XXX
+                return;
+            }
+
+            let arg = args[0];
+
+            if (arg)
+            {
+                let pages = player.getMediaPages();
+
+                for ([,page] in Iterator(pages))
+                {
+                    if (util.compareIgnoreCase(arg, page.contentTitle) == 0)
+                    {
+                        player.loadMediaPage(page, gBrowser.currentMediaListView.mediaList, gBrowser.currentMediaListView);
+                        return;
+                    }
+                }
+
+                liberator.echoerr("E475: Invalid argument: " + arg);
+            }
+        },
+        {
+            argCount: "1",
+            completer: function (context) completion.mediaView(context),
+            literal: 0
+        });
+
     // TODO: maybe :vol! could toggle mute on/off? --djk
     commands.add(["vol[ume]"],
         "Set the volume",
@@ -282,41 +355,6 @@ function Player() // {{{
         },
         { argCount: "1" });
 
-    commands.add(["load"],
-       "Load a playlist",
-       function (args)
-       {
-            let arg = args.literalArg;
-
-            if (arg)
-            {
-                // load the selected playlist/smart playlist
-                let playlists = player.getPlaylists();
-
-                for ([i, list] in Iterator(playlists))
-                {
-                    if (util.compareIgnoreCase(arg, list.name) == 0)
-                    {
-                        SBGetBrowser().loadMediaList(playlists[i]);
-                        focusTrack(_SBGetCurrentView().getItemByIndex(0));
-                        return;
-                    }
-                }
-
-                liberator.echoerr("E475: Invalid argument: " + arg);
-            }
-            else
-            {
-                // load main library if there are no args
-                _SBShowMainLibrary();
-            }
-       },
-       {
-            argCount: "?",
-            completer: function(context, args) completion.playlist(context, args),
-            literal: 0
-       });
-
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -408,6 +446,7 @@ function Player() // {{{
 
         seekTo: function seekTo(position)
         {
+            // FIXME: if not playing
             if (!gMM.playbackControl)
                 this.play();
 
@@ -500,6 +539,19 @@ function Player() // {{{
         playPlaylist: function playPlaylist(playlist, row)
         {
             gMM.sequencer.playView(playlist.createView(), row);
+        },
+
+        getMediaPages: function getMediaPages()
+        {
+            let list = gBrowser.currentMediaPage.mediaListView.mediaList;
+            let pages = pageService.getAvailablePages(list);
+            return ArrayConverter.JSArray(pages).map(function (page) page.QueryInterface(Components.interfaces.sbIMediaPageInfo));
+        },
+
+        loadMediaPage: function loadMediaList(page, list, view)
+        {
+            pageService.setPage(list, page);
+            gBrowser.loadMediaList(list, null, null, view, null);
         }
     };
     //}}}

From 1a034069db5c93c8f261fcaf4bcd3b8cf555f231 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 27 Mar 2009 01:40:36 +1100
Subject: [PATCH 097/143] Document :mediaview.

---
 xulmus/TODO                    | 1 +
 xulmus/locale/en-US/player.txt | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/xulmus/TODO b/xulmus/TODO
index 867a6947..638bf7c8 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -9,6 +9,7 @@ BUGS:
   - :open songbird-internal-search searchString
     Is this workable anyway? --djk
   - <C-^> is off by one when alternating with the media tab
+  - numbered tabs
 
 FEATURES:
 9 / and ? possibly reusing "Jump to" functionality directly.
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 8053d3c5..40160fef 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -164,4 +164,13 @@ Load [a][playlist][a]. If no playlist is specified then the main library view
 is loaded.
 ________________________________________________________________________________
 
+section:Changing{nbsp}media{nbsp}views[media-view,view]
+
+|:mediav| |:mediaview|
+||:mediav[iew] {view}|| +
+________________________________________________________________________________
+Change the media view to {view}. This can only be run when the media tab is the
+current tab.
+________________________________________________________________________________
+
 // vim: set filetype=asciidoc:

From 26fec12cade6cf62a3e30b8d51fbb8c1b20c6018 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 27 Mar 2009 13:31:31 +1100
Subject: [PATCH 098/143] Fix #204.

Fixes #204 (statusbar should follow "site identification button" color
codes).
---
 common/content/events.js            | 11 +++++++----
 common/content/style.js             |  7 ++++---
 common/content/ui.js                |  4 +++-
 vimperator/locale/en-US/styling.txt |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/content/events.js b/common/content/events.js
index 3c58afc2..51d1ecb8 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1684,13 +1684,16 @@ function Events() //{{{
                 }
             },
             // for notifying the user about secure web pages
-            onSecurityChange: function (webProgress, aRequest, aState)
+            onSecurityChange: function (webProgress, request, state)
             {
-                if (aState & Ci.nsIWebProgressListener.STATE_IS_INSECURE)
+                // TODO: do something useful with STATE_SECURE_MED and STATE_SECURE_LOW
+                if (state & Ci.nsIWebProgressListener.STATE_IS_INSECURE)
                     statusline.setClass("insecure");
-                else if (aState & Ci.nsIWebProgressListener.STATE_IS_BROKEN)
+                else if (state & Ci.nsIWebProgressListener.STATE_IS_BROKEN)
                     statusline.setClass("broken");
-                else if (aState & Ci.nsIWebProgressListener.STATE_IS_SECURE)
+                else if (state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL)
+                    statusline.setClass("extended");
+                else if (state & Ci.nsIWebProgressListener.STATE_SECURE_HIGH)
                     statusline.setClass("secure");
             },
             onStatusChange: function (webProgress, request, status, message)
diff --git a/common/content/style.js b/common/content/style.js
index d994dbd6..24a05657 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -71,9 +71,10 @@ Highlights.prototype.CSS = <![CDATA[
     LineNr      color: orange; background: white;
     Question    color: green; background: white; font-weight: bold;
 
-    StatusLine       color: white; background: black;
-    StatusLineBroken color: black; background: #FF6060 /* light-red */
-    StatusLineSecure color: black; background: #B0FF00 /* light-green */
+    StatusLine         color: white; background: black;
+    StatusLineBroken   color: black; background: #FFa0a0 /* light-red */
+    StatusLineSecure   color: black; background: #a0a0FF /* light-blue */
+    StatusLineExtended color: black; background: #a0FFa0 /* light-green */
 
     TabClose
     TabIcon
diff --git a/common/content/ui.js b/common/content/ui.js
index d01f2a2c..56abd03b 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -2018,16 +2018,18 @@ function StatusLine() //{{{
 
         /**
          * Update the status bar to indicate how secure the website is:
+         * extended - Secure connection with Extended Validation(EV) certificate.
          * secure -   Secure connection with valid certificate.
          * broken -   Secure connection with invalid certificate, or
          *            mixed content.
          * insecure - Insecure connection.
          *
-         * @param {'secure'|'broken'|'insecure'} type
+         * @param {'extended'|'secure'|'broken'|'insecure'} type
          */
         setClass: function setClass(type)
         {
             const highlightGroup = {
+                extended: "StatusLineExtended",
                 secure:   "StatusLineSecure",
                 broken:   "StatusLineBroken",
                 insecure: "StatusLine"
diff --git a/vimperator/locale/en-US/styling.txt b/vimperator/locale/en-US/styling.txt
index 62138ea9..addb7208 100644
--- a/vimperator/locale/en-US/styling.txt
+++ b/vimperator/locale/en-US/styling.txt
@@ -73,6 +73,7 @@ Valid groups are:
 *StatusLine*         The status bar
 *StatusLineBroken*   The status bar for a broken web page
 *StatusLineSecure*   The status bar for a secure web page
+*StatusLineExtended* The status bar for a secure web page with an Extended Validation(EV) certificate
 *String*             A JavaScript String object
 *TabClose*           The close button of a browser tab
 *TabIcon*            The icon of a browser tab

From 3f53319d53f1b5a1a1617565ead14126c0f70cdb Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Sun, 15 Mar 2009 13:03:17 +0100
Subject: [PATCH 099/143] Fix muttator for new nighlies

---
 common/content/liberator.js | 7 ++++++-
 muttator/install.rdf        | 2 +-
 vimperator/Donors           | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index c0798fae..9c0b2279 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1225,7 +1225,12 @@ const liberator = (function () //{{{
             config.features.push(getPlatformFeature());
             config.defaults = config.defaults || {};
             config.guioptions = config.guioptions || {};
-            config.browserModes = config.browserModes || [modes.NORMAL];
+
+            // -> we can't use this, since config.browserModes might already be defined as a getter-only
+            // TODO: also change the other config.* defaults?
+            // config.browserModes = config.browserModes || [modes.NORMAL];
+            if (!config.browserModes)
+                 config.browserModes = [modes.NORMAL];
             config.mailModes = config.mailModes || [modes.NORMAL];
             // TODO: suitable defaults?
             //config.mainWidget
diff --git a/muttator/install.rdf b/muttator/install.rdf
index 3785bda0..81010653 100644
--- a/muttator/install.rdf
+++ b/muttator/install.rdf
@@ -20,7 +20,7 @@
 	    <Description>
 		<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
 		<em:minVersion>3.0b2pre</em:minVersion>
-		<em:maxVersion>3.0b2</em:maxVersion>
+		<em:maxVersion>3.0b3</em:maxVersion>
 	    </Description>
 	</em:targetApplication>
 
diff --git a/vimperator/Donors b/vimperator/Donors
index e94055cb..7bb5b379 100644
--- a/vimperator/Donors
+++ b/vimperator/Donors
@@ -2,6 +2,10 @@ Continuous donations:
 * Daniel Bainton (web hosting)
 
 2009:
+* Fabien Benetou
+* Arvin Moezzi
+* Calogero Lo Leggio
+* Sapan Bhatia
 * Gavin Sinclair
 * Stephen Borchert
 * Convolution

From c342cdd7c963fa37052c4f770b5b6d143e0cac26 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Fri, 27 Mar 2009 11:43:45 +0100
Subject: [PATCH 100/143] updated donors

---
 vimperator/Donors | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vimperator/Donors b/vimperator/Donors
index 7bb5b379..6dd5baac 100644
--- a/vimperator/Donors
+++ b/vimperator/Donors
@@ -2,6 +2,9 @@ Continuous donations:
 * Daniel Bainton (web hosting)
 
 2009:
+* Christoph Petzold
+* Bjoern Steinbrink
+* Erlend Hamberg
 * Fabien Benetou
 * Arvin Moezzi
 * Calogero Lo Leggio

From f06f1d776e28254a9e962512fc04246165450085 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Fri, 27 Mar 2009 23:32:03 +0530
Subject: [PATCH 101/143] Added SearchView - '/', 'n' & 'N'

---
 common/content/modes.js  |  2 ++
 xulmus/content/player.js | 73 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/common/content/modes.js b/common/content/modes.js
index f0d71735..0ae21289 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -277,6 +277,8 @@ const modes = (function () //{{{
     self.addMode("OUTPUT_MULTILINE", true);
     self.addMode("SEARCH_FORWARD", true);
     self.addMode("SEARCH_BACKWARD", true);
+    self.addMode("SEARCH_VIEW_FORWARD", true);
+    self.addMode("SEARCH_VIEW_BACKWARD", true);
     self.addMode("MENU", true); // a popupmenu is active
     self.addMode("LINE", true); // linewise visual mode
     self.addMode("PROMPT", true);
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index e3710cf4..e6198d7f 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -8,11 +8,20 @@ function Player() // {{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    let lastSearchString = "";
+    let lastSearchIndex = 0;
+    let lastSearchView = _SBGetCurrentView();
+
     // Get the focus to the visible playlist first
     //window._SBShowMainLibrary();
 
     const pageService = Components.classes["@songbirdnest.com/Songbird/MediaPageManager;1"]
                                   .getService(Components.interfaces.sbIMediaPageManager);
+    // Register Callbacks for searching.
+
+    liberator.registerCallback("change", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
+    liberator.registerCallback("submit", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
+    //liberator.registerCallback("cancel", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
 
     // interval (milliseconds)
     function seek(interval, direction)
@@ -143,6 +152,18 @@ function Player() // {{{
          ["-"], "Decrease volume by 10%",
          function () { player.decreaseVolume(); });
 
+    mappings.add([modes.PLAYER],
+         ["/"], "Search View",
+         function (args) { commandline.open("/", "", modes.SEARCH_VIEW_FORWARD); });
+
+    mappings.add([modes.PLAYER],
+         ["n"], "Find Next",
+         function () { player.searchViewAgain(false);});
+    
+    mappings.add([modes.PLAYER],
+         ["N"], "Find Previous",
+         function () { player.searchViewAgain(true);});
+
     ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -495,22 +516,64 @@ function Player() // {{{
             return tracksList;
         },
 
-        // TODO: Use this for implementing "/" and "?". -ken
-        searchTracks: function searchTracks(args)
+        searchView: function searchView (args)
         {
             let currentView = _SBGetCurrentView();
             let mediaItemList = currentView.mediaList;
             let search = _getSearchString(currentView);
             let searchString = "";
+            let index = 0;
 
             if (search != "")
                 searchString = args + " " + search;
             else
                 searchString = args;
-
-            let myView = LibraryUtils.createStandardMediaListView(mediaItemList, searchString);
-            focusTrack(myView.getItemByIndex(0));
+            
+            lastSearchString = searchString;
+            
+            let mySearchView = LibraryUtils.createStandardMediaListView(mediaItemList, searchString);
+            
+            if (mySearchView.length)
+            {
+                lastSearchView = mySearchView;
+                focusTrack(mySearchView.getItemByIndex(index));
+            }
+            else
+            {
+                liberator.echoerr("E486 Pattern not found: "+searchString, commandline.FORCE_SINGLELINE);
+            }
         },
+ 
+        //FIXME: commandline.echo should work --ken
+        searchViewAgain: function searchViewAgain(reverse)
+        {
+            if (reverse)
+            {
+                if (lastSearchIndex == 0)
+                {
+                    //commandline.echo("Search hit TOP, continuing at BOTTOM",
+                    //      commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
+                    lastSearchIndex = lastSearchView.length - 1;
+                }
+                else
+                    lastSearchIndex = lastSearchIndex - 1;
+            }
+            else
+            {
+                if (lastSearchIndex == (lastSearchView.length -1))
+                {
+                    //commandline.echo("Search hit BOTTOM, continuing at TOP",
+                    //      commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
+                    lastSearchIndex = 0;
+                }
+                else
+                    lastSearchIndex = lastSearchIndex + 1;
+            }
+
+            //FIXME: Implement for "?" --ken
+            commandline.echo("/" + lastSearchString, null, commandline.FORCE_SINGLELINE);
+            focusTrack(lastSearchView.getItemByIndex(lastSearchIndex));
+        }, 
 
         getPlaylists: function getPlaylists()
         {

From 909485a96c7eaa9eb8694f17aada23d3541bfa6d Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 00:09:53 +0530
Subject: [PATCH 102/143] Documented search operations and fixed typo in :seek

---
 xulmus/locale/en-US/player.txt | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 40160fef..d2c536a3 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -118,7 +118,7 @@ Seek -1m.
 ________________________________________________________________________________
 
 
-|:see]| |:seek|
+|:see| |:seek|
 ||:see[k] {[HH:]MM:SS]}|| +
 ||:see[k] +{time[hms]} | -{time[hms]}|| +
 ________________________________________________________________________________
@@ -141,7 +141,7 @@ ________________________________________________________________________________
 
 
 |-|
-||-||
+||-|| +
 ________________________________________________________________________________
 Decrease volume by 10%.
 ________________________________________________________________________________
@@ -173,4 +173,26 @@ Change the media view to {view}. This can only be run when the media tab is the
 current tab.
 ________________________________________________________________________________
 
+section:Search{nbsp}commands[search]
+
+|/|
+||/{pattern}<CR>|| +
+________________________________________________________________________________
+Search for the first occurence of {pattern} in the visisble view.
+________________________________________________________________________________
+
+|n|
+||n|| +
+________________________________________________________________________________
+Find next. Repeats the last search. If the search hits BOTTOM of the view, it 
+continues from TOP.
+________________________________________________________________________________
+
+|N|
+||N|| +
+________________________________________________________________________________
+Find previous. Repeats the last search in the opposite direction. If the search 
+hits TOP of the view, it continues from BOTTTOM.
+________________________________________________________________________________
+
 // vim: set filetype=asciidoc:

From 187f7229e22bb66ca42eaffa7d40080520e317cf Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 00:18:27 +0530
Subject: [PATCH 103/143] Updated TODO

---
 xulmus/TODO | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index 638bf7c8..16d91ee8 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -12,8 +12,8 @@ BUGS:
   - numbered tabs
 
 FEATURES:
-9 / and ? possibly reusing "Jump to" functionality directly.
-8 Playlist/SmartPlaylist operations.
+9 '?' - Reusing '/'. 
+8 Playlist/SmartPlaylist operations & meta-data operations.
 7 extended hint mode for opening links in FF.
 5 Check for default extensions and add commands for them. Ex. Last.fm, Seeqpod e.t.c
     Wouldn't these be provided as Xulmus plugins like Vimperator does? --djk

From 2b1010251b6a9e258f316410fa329b6498747a60 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 01:14:08 +0530
Subject: [PATCH 104/143] Added mappings for changing rating of current
 mediaItem

---
 xulmus/content/player.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index e6198d7f..2da8215b 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -164,6 +164,32 @@ function Player() // {{{
          ["N"], "Find Previous",
          function () { player.searchViewAgain(true);});
 
+    //FIXME: Better way to do this ? --ken
+    mappings.add([modes.PLAYER],
+         ["<C-0>"], "Rate the current media item 0",
+         function () { player.rateMediaItem(0); });
+    
+    mappings.add([modes.PLAYER],
+         ["<C-1>"], "Rate the current media item 1",
+         function () { player.rateMediaItem(1); });
+
+    mappings.add([modes.PLAYER],
+         ["<C-2>"], "Rate the current media item 2",
+         function () { player.rateMediaItem(2); });
+
+    mappings.add([modes.PLAYER],
+         ["<C-3>"], "Rate the current media item 3",
+         function () { player.rateMediaItem(3); });
+
+    mappings.add([modes.PLAYER],
+         ["<C-4>"], "Rate the current media item 4",
+         function () { player.rateMediaItem(4); });
+
+    mappings.add([modes.PLAYER],
+         ["<C-5>"], "Rate the current media item 5",
+         function () { player.rateMediaItem(5); });
+    
+         
     ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -414,11 +440,13 @@ function Player() // {{{
         next: function next()
         {
             gSongbirdWindowController.doCommand("cmd_control_next");
+            gSongbirdWindowController.doCommand("cmd_find_current_track");
         },
 
         previous: function previous()
         {
             gSongbirdWindowController.doCommand("cmd_control_previous");
+            gSongbirdWindowController.doCommand("cmd_find_current_track");
         },
 
         togglePlayPause: function togglePlayPause()
@@ -615,6 +643,12 @@ function Player() // {{{
         {
             pageService.setPage(list, page);
             gBrowser.loadMediaList(list, null, null, view, null);
+        },
+
+        rateMediaItem: function rateMediaItem(rating)
+        {
+            if (gMM.sequencer.currentItem)
+                gMM.sequencer.currentItem.setProperty(SBProperties.rating, rating); 
         }
     };
     //}}}

From 7c9767822843bc52671532492df7870eb4d0dc5a Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 02:43:40 +0530
Subject: [PATCH 105/143] Fixed typo in player.txt

---
 xulmus/locale/en-US/player.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index d2c536a3..0a807c64 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -178,7 +178,7 @@ section:Search{nbsp}commands[search]
 |/|
 ||/{pattern}<CR>|| +
 ________________________________________________________________________________
-Search for the first occurence of {pattern} in the visisble view.
+Search for the first occurence of {pattern} in the visible media view.
 ________________________________________________________________________________
 
 |n|

From ec6cfad1e0c6ff3741553e7e697008e78082ac6b Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 03:14:41 +0530
Subject: [PATCH 106/143] Fixed SearchViewAgain

---
 xulmus/content/player.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 2da8215b..4b22e0a2 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -564,6 +564,7 @@ function Player() // {{{
             if (mySearchView.length)
             {
                 lastSearchView = mySearchView;
+                lastSearchIndex = 0;
                 focusTrack(mySearchView.getItemByIndex(index));
             }
             else
@@ -601,6 +602,7 @@ function Player() // {{{
             //FIXME: Implement for "?" --ken
             commandline.echo("/" + lastSearchString, null, commandline.FORCE_SINGLELINE);
             focusTrack(lastSearchView.getItemByIndex(lastSearchIndex));
+            
         }, 
 
         getPlaylists: function getPlaylists()

From d3a5d3d229bcd7846ec05774eaa6b05f66c0589c Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 05:02:59 +0530
Subject: [PATCH 107/143] Refactor player.js & Changed the install maxVersion
 to 1.2.0pre

---
 common/content/completion.js |   6 +-
 xulmus/content/player.js     | 200 ++++++++++++++++++-----------------
 xulmus/install.rdf           |   2 +-
 3 files changed, 107 insertions(+), 101 deletions(-)

diff --git a/common/content/completion.js b/common/content/completion.js
index 0494759b..c5ee7a1a 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1395,17 +1395,17 @@ function Completion() //{{{
             if (args.completeArg == 0)
             {
                 context.title = ["Artists"];
-                context.completions = getArtists();
+                context.completions = player.getArtists();
             }
             else if (args.completeArg == 1)
             {
                 context.title = ["Albums by " + args[0]];
-                context.completions = getAlbums(args[0]);
+                context.completions =  player.getAlbums(args[0]);
             }
             else if (args.completeArg == 2)
             {
                 context.title = ["Tracks from " + args[1] + " by " + args[0]];
-                context.completions = getTracks(args[0], args[1]);
+                context.completions = player.getTracks(args[0], args[1]);
             }
         },
 
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 4b22e0a2..2d8b3c0d 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -1,6 +1,6 @@
 // Import Artist List as this can be huge
 
-var artists = getArtistsArray();
+
 
 function Player() // {{{
 {
@@ -11,10 +11,53 @@ function Player() // {{{
     let lastSearchString = "";
     let lastSearchIndex = 0;
     let lastSearchView = _SBGetCurrentView();
-
+   
     // Get the focus to the visible playlist first
     //window._SBShowMainLibrary();
+    
+    
+    function getArtistsArray()
+    {
+        var list = LibraryUtils.mainLibrary;
 
+        //  Create an enumeration listener to count each item
+        var listener = {
+                count: 0,
+                onEnumerationBegin: function (aMediaList) {
+                this.count = 0;
+                },
+        onEnumeratedItem: function (aMediaList, aMediaItem) {
+                this.count++;
+                },
+        onEnumerationEnd: function (aMediaList, aStatusCode) {}
+        };
+
+        var artistCounts = {};
+        var artists = list.getDistinctValuesForProperty(SBProperties.artistName);
+        var artist;
+        var artistArray = [];
+        var i = 0;
+        // Count the number of media items for each distinct artist
+        while (artists.hasMore())
+        {
+            artist = artists.getNext();
+            artistArray[i] = [artist, artist];
+            list.enumerateItemsByProperty(SBProperties.artistName,
+                    artist,
+                    listener,
+                    Ci.sbIMediaList.ENUMERATIONTYPE_LOCKING);
+            artistCounts[artist] = listener.count;
+            i++;
+        }
+        
+        //liberator.dump("Count : "+artistCounts.toSource());
+        return artistArray;
+    }
+
+    // Get the artist names before hand.
+
+    let artists = getArtistsArray();
+    
     const pageService = Components.classes["@songbirdnest.com/Songbird/MediaPageManager;1"]
                                   .getService(Components.interfaces.sbIMediaPageManager);
     // Register Callbacks for searching.
@@ -550,7 +593,6 @@ function Player() // {{{
             let mediaItemList = currentView.mediaList;
             let search = _getSearchString(currentView);
             let searchString = "";
-            let index = 0;
 
             if (search != "")
                 searchString = args + " " + search;
@@ -565,7 +607,7 @@ function Player() // {{{
             {
                 lastSearchView = mySearchView;
                 lastSearchIndex = 0;
-                focusTrack(mySearchView.getItemByIndex(index));
+                focusTrack(mySearchView.getItemByIndex(lastSearchIndex));
             }
             else
             {
@@ -651,103 +693,67 @@ function Player() // {{{
         {
             if (gMM.sequencer.currentItem)
                 gMM.sequencer.currentItem.setProperty(SBProperties.rating, rating); 
+        },
+
+        getArtists: function getArtists()
+        {
+            return artists;
+        },
+
+        getAlbums: function getAlbums(artist)
+        {
+            var list = LibraryUtils.mainLibrary;
+            var albumArray = [], returnArray = [];
+            var items = list.getItemsByProperty(SBProperties.artistName, artist).enumerate();
+            var i = 0, j = 0;
+
+
+            while (items.hasMoreElements())
+            {
+                album = items.getNext().getProperty(SBProperties.albumName);
+                albumArray[i] = [album, album];
+
+                if (i == 0)
+                {
+                    returnArray[j] = albumArray[i];
+                    j++;
+                }
+                else if (albumArray[i-1].toString() != albumArray[i].toString())
+                {
+                    returnArray[i] = albumArray[i];
+                    j++;
+                }
+                i++;
+            }
+
+            return returnArray;
+        },
+
+        getTracks: function getTracks(artist, album)
+        {
+            var list = LibraryUtils.mainLibrary;
+            var tracksArray = [];
+            var pa = Cc["@songbirdnest.com/Songbird/Properties/MutablePropertyArray;1"]
+                .createInstance(Ci.sbIMutablePropertyArray);
+            var i = 0;
+
+            pa.appendProperty(SBProperties.artistName, artist.toString());
+            pa.appendProperty(SBProperties.albumName, album.toString());
+            var items = list.getItemsByProperties(pa).enumerate();
+
+            while (items.hasMoreElements())
+            {
+                track = items.getNext().getProperty(SBProperties.trackName);
+                tracksArray[i] = [track, track];
+                i++;
+            }
+
+            return tracksArray;
         }
+        
     };
     //}}}
 } // }}}
 
-function getArtists()
-{
-    return this.artists;
-}
-
-function getArtistsArray()
-{
-    var list = LibraryUtils.mainLibrary;
-
-    //  Create an enumeration listener to count each item
-    var listener = {
-        count: 0,
-        onEnumerationBegin: function (aMediaList) {
-            this.count = 0;
-        },
-        onEnumeratedItem: function (aMediaList, aMediaItem) {
-            this.count++;
-        },
-        onEnumerationEnd: function (aMediaList, aStatusCode) {}
-    };
-
-    var artistCounts = {};
-    var artists = list.getDistinctValuesForProperty(SBProperties.artistName);
-    var artist;
-    var artistArray = [];
-    var i = 0;
-    // Count the number of media items for each distinct artist
-    while (artists.hasMore())
-    {
-        artist = artists.getNext();
-        artistArray[i] = [artist, artist];
-        list.enumerateItemsByProperty(SBProperties.artistName,
-            artist,
-            listener,
-            Ci.sbIMediaList.ENUMERATIONTYPE_LOCKING);
-        artistCounts[artist] = listener.count;
-        i++;
-    }
-
-    //liberator.dump("Count : "+artistCounts.toSource());
-    return artistArray;
-}
-
-function getAlbums(artist)
-{
-    var list = LibraryUtils.mainLibrary;
-    var albumArray = [], returnArray = [];
-    var items = list.getItemsByProperty(SBProperties.artistName, artist).enumerate();
-    var i = 0, j = 0;
-
-
-    while (items.hasMoreElements())
-    {
-        album = items.getNext().getProperty(SBProperties.albumName);
-        albumArray[i] = [album, album];
-
-        if (i == 0)
-        {
-            returnArray[j] = albumArray[i];
-            j++;
-        }
-        else if (albumArray[i-1].toString() != albumArray[i].toString())
-        {
-             returnArray[i] = albumArray[i];
-             j++;
-        }
-        i++;
-    }
-
-    return returnArray;
-}
-
-function getTracks(artist, album)
-{
-    var list = LibraryUtils.mainLibrary;
-    var tracksArray = [];
-    var pa = Cc["@songbirdnest.com/Songbird/Properties/MutablePropertyArray;1"]
-                 .createInstance(Ci.sbIMutablePropertyArray);
-    var i = 0;
-
-    pa.appendProperty(SBProperties.artistName, artist.toString());
-    pa.appendProperty(SBProperties.albumName, album.toString());
-    var items = list.getItemsByProperties(pa).enumerate();
-
-    while (items.hasMoreElements())
-    {
-        track = items.getNext().getProperty(SBProperties.trackName);
-        tracksArray[i] = [track, track];
-        i++;
-    }
-
-    return tracksArray;
-}
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/xulmus/install.rdf b/xulmus/install.rdf
index 7dccc3a8..3851c0af 100755
--- a/xulmus/install.rdf
+++ b/xulmus/install.rdf
@@ -12,7 +12,7 @@
       <Description>
         <em:id>songbird@songbirdnest.com</em:id>
         <em:minVersion>0.8.0pre</em:minVersion>
-        <em:maxVersion>1.1.0pre</em:maxVersion>
+        <em:maxVersion>1.2.0pre</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

From 2c352c285b41c330b603ac5c7ff4fa98d9e8022e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 02:13:18 +1100
Subject: [PATCH 108/143] Update help files for Xulmus.

---
 xulmus/content/config.js          | 22 +++++++---------
 xulmus/locale/en-US/browsing.txt  | 24 ++++++++---------
 xulmus/locale/en-US/buffer.txt    |  4 +--
 xulmus/locale/en-US/developer.txt |  2 +-
 xulmus/locale/en-US/eval.txt      |  4 +--
 xulmus/locale/en-US/gui.txt       | 43 +++++++------------------------
 xulmus/locale/en-US/hints.txt     |  2 +-
 xulmus/locale/en-US/index.txt     | 41 +++++++++++++++++++++++++----
 xulmus/locale/en-US/intro.txt     | 43 ++++++++++++++-----------------
 xulmus/locale/en-US/map.txt       |  8 +++---
 xulmus/locale/en-US/marks.txt     |  4 +--
 xulmus/locale/en-US/message.txt   |  2 +-
 xulmus/locale/en-US/pattern.txt   |  4 +--
 xulmus/locale/en-US/print.txt     |  2 +-
 xulmus/locale/en-US/repeat.txt    | 10 +++----
 xulmus/locale/en-US/starting.txt  | 10 +++----
 xulmus/locale/en-US/styling.txt   |  4 +--
 xulmus/locale/en-US/tabs.txt      | 31 +++++++++++-----------
 xulmus/locale/en-US/various.txt   |  4 +--
 19 files changed, 133 insertions(+), 131 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 89590b57..248b6a6e 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -116,7 +116,7 @@ const config = { //{{{
             function () { window.BrowserViewSourceOfDocument(content.document); }],
         ["places",           "Places Organizer: Manage your bookmarks and history",
             function () { PlacesCommandHook.showPlacesOrganizer(ORGANIZER_ROOT_BOOKMARKS); }],
-        ["preferences",      "Show Firefox preferences dialog",
+        ["preferences",      "Show Songbird preferences dialog",
             function () { window.openPreferences(); }],
         /*
         ["printpreview",     "Preview the page before printing",
@@ -138,14 +138,14 @@ const config = { //{{{
 
     //TODO : Write intro.html and tutorial.html
     // they are sorted by relevance, not alphabetically
-    helpFiles: [ "player.html", "options.html", "autocommands.html" ],
-       /* "intro.html", "tutorial.html", "starting.html", "browsing.html",
-        "buffer.html", "cmdline.html", "insert.html", "options.html",
-        "pattern.html", "tabs.html", "hints.html", "map.html", "eval.html",
-        "marks.html", "repeat.html", "autocommands.html", "print.html",
-        "gui.html", "styling.html", "message.html", "developer.html",
-        "various.html", "index.html", "version.html"
-    ], */
+    helpFiles: [
+        "intro.html", /*"tutorial.html",*/ "starting.html", "player.html",
+        "browsing.html", "buffer.html", "cmdline.html", "insert.html",
+        "options.html", "pattern.html", "tabs.html", "hints.html", "map.html",
+        "eval.html", "marks.html", "repeat.html", "autocommands.html",
+        "print.html", "gui.html", "styling.html", "message.html",
+        "developer.html", "various.html", "index.html", "version.html"
+    ],
 
     scripts: [
         "bookmarks.js",
@@ -155,8 +155,6 @@ const config = { //{{{
 
     init: function ()
     {
-        options["helpfile"] = "player.html";
-
         //Adding a mode for Player
         //modes.addMode("PLAYER"); // Player mode for songbird
 
@@ -375,7 +373,7 @@ const config = { //{{{
             "Show " + config.hostApplication + " preferences",
             function (args)
             {
-                if (args.bang) // open Firefox settings GUI dialog
+                if (args.bang) // open Songbird settings GUI dialog
                 {
                     liberator.open("about:config",
                         (options["newtab"] && options.get("newtab").has("all", "prefs"))
diff --git a/xulmus/locale/en-US/browsing.txt b/xulmus/locale/en-US/browsing.txt
index 9b44fa8a..ddbe2add 100755
--- a/xulmus/locale/en-US/browsing.txt
+++ b/xulmus/locale/en-US/browsing.txt
@@ -2,15 +2,15 @@ HEADER
 
 |surfing| |browsing| +
 
-Vimperator overrides nearly all Firefox keys in order to make browsing more
+Xulmus overrides nearly all Songbird keys in order to make browsing more
 pleasant for Vim users. On the rare occasions when you want to pass a keystroke
-to Firefox, or to the web page, and have it retain its original meaning you
+to Songbird, or to the web page, and have it retain its original meaning you
 have 2 possibilities:
 
 |pass-through| |<C-z>| |CTRL-Z| +
 ||CTRL-Z||
 ________________________________________________________________________________
-Disable all Vimperator keys except [m]<Esc>[m] and pass them to the next event
+Disable all Xulmus keys except [m]<Esc>[m] and pass them to the next event
 handler. This is especially useful, if JavaScript controlled forms like the
 RichEdit form fields of Gmail don't work anymore. To exit this mode, press
 [m]<Esc>[m]. If you also need to pass [m]<Esc>[m] in this mode to the web page,
@@ -21,10 +21,10 @@ ________________________________________________________________________________
 ||CTRL-V||
 ________________________________________________________________________________
 If you only need to pass a single key to a JavaScript form field or another
-extension prefix the key with [m]<C-v>[m]. Also works to unshadow Firefox
-shortcuts like [m]<C-o>[m] which are otherwise hidden in Vimperator. When
-Vimperator mode is temporarily disabled with [m]<C-z>[m], [m]<C-v>[m] will pass
-the next key to Vimperator instead of the web page.
+extension prefix the key with [m]<C-v>[m]. Also works to unshadow Songbird
+shortcuts like [m]<C-o>[m] which are otherwise hidden in Xulmus. When
+Xulmus mode is temporarily disabled with [m]<C-z>[m], [m]<C-v>[m] will pass
+the next key to Xulmus instead of the web page.
 ________________________________________________________________________________
 
 section:Opening{nbsp}web{nbsp}pages[opening]
@@ -52,7 +52,7 @@ Each token is analyzed and in this order:
 3. Opened with the default search engine or keyword (specified with the
    'defsearch' option) if the first word is no search engine ([c]:open linus
    torvalds[c] opens a Google search for linux torvalds).
-4. Passed directly to Firefox in all other cases ([c]:open www.osnews.com,
+4. Passed directly to Songbird in all other cases ([c]:open www.osnews.com,
    www.slashdot.org[c] opens OSNews in the current, and Slashdot in a new
    background tab).
 
@@ -286,7 +286,7 @@ section:Quitting[quitting,save-session]
 ||:q[uit]||
 ________________________________________________________________________________
 Quit current tab. If this is the last tab in the window, close the window. If
-this was the last window, close Vimperator. When quitting Vimperator, the
+this was the last window, close Xulmus. When quitting Xulmus, the
 session is not stored.
 ________________________________________________________________________________
 
@@ -294,7 +294,7 @@ ________________________________________________________________________________
 |:qa| |:qall| |:quita| |:quitall| +
 ||:quita[ll]||
 ________________________________________________________________________________
-Quit Vimperator. Quit Vimperator, no matter how many tabs/windows are open.
+Quit Xulmus. Quit Xulmus, no matter how many tabs/windows are open.
 The session is not stored.
 ________________________________________________________________________________
 
@@ -310,7 +310,7 @@ ________________________________________________________________________________
 ||:wqa[ll]|| +
 ||:xa[ll]||
 ________________________________________________________________________________
-Save the session and quit. Quit Vimperator, no matter how many tabs/windows
+Save the session and quit. Quit Xulmus, no matter how many tabs/windows
 are open. The session is stored. [c]:wq[c] is different from 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.
@@ -327,7 +327,7 @@ ________________________________________________________________________________
 |ZZ|
 ||ZZ||
 ________________________________________________________________________________
-Quit and save the session. Quit Vimperator, no matter how many tabs/windows
+Quit and save the session. Quit Xulmus, no matter how many tabs/windows
 are open. The session is stored. Works like [c]:xall[c].
 ________________________________________________________________________________
 
diff --git a/xulmus/locale/en-US/buffer.txt b/xulmus/locale/en-US/buffer.txt
index 91022f27..50bc589a 100755
--- a/xulmus/locale/en-US/buffer.txt
+++ b/xulmus/locale/en-US/buffer.txt
@@ -2,7 +2,7 @@ HEADER
 
 |buffer| |document| +
 
-Vimperator holds exactly one buffer object for each tab. It is usually an
+Xulmus holds exactly one buffer object for each tab. It is usually an
 (X)HTML document with advanced features.
 
 section:Buffer{nbsp}information[buffer-information]
@@ -234,7 +234,7 @@ default zoom levels are 30%, 50%, 67%, 80%, 90%, 100%, 110%, 120%, 133%, 150%,
 170%, 200%, 240%, 300%.
 
 The available zoom range can be changed by setting the \'zoom.minPercent' and
-\'zoom.maxPercent' Firefox preferences. The zoom levels can be changed using
+\'zoom.maxPercent' Songbird preferences. The zoom levels can be changed using
 the \'toolkit.ZoomManager.zoomLevels' preference.
 
 Note: \'toolkit.ZoomManager.zoomLevels' is specified as a list of values
diff --git a/xulmus/locale/en-US/developer.txt b/xulmus/locale/en-US/developer.txt
index cf875d82..7401a2f1 100755
--- a/xulmus/locale/en-US/developer.txt
+++ b/xulmus/locale/en-US/developer.txt
@@ -60,7 +60,7 @@ Some notes about the code above:
   automatically marked up as an argument.
 
 There are also some additional asciidoc commands specifically for writing
-Vimperator documentation:
+Xulmus documentation:
 
 - *$$section:Writing{nbsp}documentation[writing-docs,documentation]$$* Creates
   a new section like _Writing Documentation_ in this help file with 2 tags.
diff --git a/xulmus/locale/en-US/eval.txt b/xulmus/locale/en-US/eval.txt
index 17c71dda..accb6fce 100755
--- a/xulmus/locale/en-US/eval.txt
+++ b/xulmus/locale/en-US/eval.txt
@@ -53,10 +53,10 @@ passing the argument to `eval()`.
 is found, and interpret them with the JavaScript _eval()_ function.
 
 The special version [c]:javascript![c] opens the JavaScript console of
-Firefox.
+Songbird.
 
 [m]<Tab>[m] completion is available for [c]:javascript {cmd}<Tab>[c] (but not
-yet for the [c]:js <<EOF[c] multiline widget). Be aware that Vimperator needs
+yet for the [c]:js <<EOF[c] multiline widget). Be aware that Xulmus needs
 to run {cmd} through eval() to get the completions, which could have unwanted
 side effects.
 ________________________________________________________________________________
diff --git a/xulmus/locale/en-US/gui.txt b/xulmus/locale/en-US/gui.txt
index 4da826c5..1f19a621 100755
--- a/xulmus/locale/en-US/gui.txt
+++ b/xulmus/locale/en-US/gui.txt
@@ -2,7 +2,7 @@ HEADER
 
 |gui| +
 
-Although Vimperator offers the most frequently used Firefox functionality via
+Although Xulmus offers the most frequently used Songbird functionality via
 Ex and Normal mode commands there may be times when directly accessing the GUI
 is required. There are commands for accessing the menu system, standard dialogs
 and the sidebar.
@@ -11,7 +11,7 @@ and the sidebar.
 ||:emenu {menu}||
 ________________________________________________________________________________
 Execute {menu} from the command line. This command provides command-line access
-to all menu items available from the main Firefox menubar. {menu} is a
+to all menu items available from the main Songbird menubar. {menu} is a
 hierarchical path to the menu item with each submenu separated by a period.
 E.g. [c]:emenu File.Open File...[c]
 ________________________________________________________________________________
@@ -20,39 +20,32 @@ ________________________________________________________________________________
 |:addo| |:addons| +
 ||:addo[ns]||
 ________________________________________________________________________________
-Show available Browser Extensions and Themes.
-You can add/remove/disable browser extensions from this dialog.
-Be aware that not all Firefox extensions work, because Vimperator overrides
-some key bindings and changes Firefox's GUI.
+Show available Songbird Extensions and Themes.
+You can add/remove/disable extensions from this dialog.
+Be aware that not all Songbird extensions work, because Xulmus overrides
+some key bindings and changes Songbird's GUI.
 ________________________________________________________________________________
 
 
 |:dia| |:dialog|
 ||:dia[log] [a][firefox-dialog][a]|| +
 ________________________________________________________________________________
-Open a Firefox dialog.
+Open a Songbird dialog.
 
 Available dialogs:
 `------------------`-----------------------------------
-*about*            About Firefox
-*addbookmark*      Add bookmark for the current page
+*about*            About Songbird
 *addons*           Manage Add-ons
-*bookmarks*        List your bookmarks
 *checkupdates*     Check for updates
 *cleardata*        Clear private data
 *cookies*          List your cookies
 *console*          JavaScript console
-*customizetoolbar* Customize the Toolbar
 *dominspector*     DOM Inspector
 *downloads*        Manage Downloads
-*history*          List your history
-*import*           Import Preferences, Bookmarks, History, etc. from other browsers
 *openfile*         Open the file selector dialog
-*pageinfo*         Show information about the current page
 *pagesource*       View page source
 *places*           Places Organizer: Manage your bookmarks and history
-*preferences*      Show Firefox preferences dialog
-*printpreview*     Preview the page before printing
+*preferences*      Show Songbird preferences dialog
 *printsetup*       Setup the page size and orientation before printing
 *print*            Show print dialog
 *saveframe*        Save frame to disk
@@ -67,24 +60,8 @@ ________________________________________________________________________________
 |:dl| |:downl| |:downloads| +
 ||:downl[oads]||
 ________________________________________________________________________________
-Show progress of current downloads. Open the original Firefox download dialog
+Show progress of current downloads. Open the original Songbird download dialog
 in a new tab. Here, downloads can be paused, canceled and resumed.
 ________________________________________________________________________________
 
-
-|:sbcl| |:sbclose| +
-||:sbcl[ose]||
-________________________________________________________________________________
-Close the sidebar window.
-________________________________________________________________________________
-
-
-|:sbope| |:sbopen| |:sb| |:sbar| |:sideb| |:sidebar| +
-||:sidebar {name}||
-________________________________________________________________________________
-Open the sidebar window. {name} 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.
-________________________________________________________________________________
-
 // vim: set filetype=asciidoc:
diff --git a/xulmus/locale/en-US/hints.txt b/xulmus/locale/en-US/hints.txt
index ef3200bb..aba281d5 100755
--- a/xulmus/locale/en-US/hints.txt
+++ b/xulmus/locale/en-US/hints.txt
@@ -25,7 +25,7 @@ ________________________________________________________________________________
 Start QuickHint mode, but open link in a new tab. Like normal QuickHint
 mode (activated with [m]f[m]) but opens the link in a new tab. The new
 tab will be loaded in background according to the
-\'browser.tabs.loadInBackground' Firefox preference.
+\'browser.tabs.loadInBackground' Songbird preference.
 ________________________________________________________________________________
 
 
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index 5a6a2fbb..ce56d602 100755
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -4,6 +4,25 @@ HEADER
 
 This file contains a list of all available commands.
 
+section:Player{nbsp}mode[player-index]
+
+||[m]x[m]|| Play the current track +
+||[m]z[m]|| Play the previous track +
+||[m]b[m]|| Play the next track +
+||[m]c[m]|| Pause/unpause the current track +
+||[m]v[m]|| Stop playing the current track +
+||[m]t[m]|| Toggle shuffle mode +
+||[m]r[m]|| Toggle repeat mode +
+||[m]i[m]|| Select the currently playing track +
+||[m]f[m]|| Filter and play tracks +
+||[m]F[m]|| Filter and show the tracks as a view +
+||[m]h[m]|| Seek -10s +
+||[m]l[m]|| Seek +10s +
+||[m]H[m]|| Seek -1m +
+||[m]L[m]|| Seek +1m +
+||[m]+[m]|| Increase volume by 10% +
+||[m]-[m]|| Decrease volume by 10% +
+
 section:Insert{nbsp}mode[insert-index]
 
 ||[m]<C-i>[m]|| Launch the external editor +
@@ -24,7 +43,7 @@ section:Normal{nbsp}mode[normal-index]
 ||[m]<C-u>[m]|| Scroll window upwards in the buffer +
 ||[m]<C-v>[m]|| Pass through next key +
 ||[m]<C-x>[m]|| Decrement last number in URL +
-||[m]<C-z>[m]|| Temporarily ignore all Vimperator key bindings +
+||[m]<C-z>[m]|| Temporarily ignore all Xulmus key bindings +
 
 ||[m]<Esc>[m]|| Focus content +
 
@@ -141,6 +160,18 @@ section:Command-line{nbsp}editing[ex-edit-index]
 
 section:Ex{nbsp}commands[ex-cmd-index,:index]
 
+||[c]:playerplay[c]|| Play the current track +
+||[c]:playerprev[c]|| Play the previous track +
+||[c]:playernext[c]|| Play the next track +
+||[c]:playerpause[c]|| Pause/unpause the current track +
+||[c]:playerstop[c]|| Stop playing the current track +
+||[c]:filter[c]|| Filter and play tracks +
+||[c]:Filter[c]|| Filter and show the tracks as a view +
+||[c]:seek[c]|| Seek to an absolute or relative position in a track +
+||[c]:volume[c]|| Set the player volume +
+||[c]:load[c]|| Load a playlist +
+||[c]:mediaview[c]|| Change the media view +
+
 ||[c]:![c]|| Run a command +
 ||[c]:abbreviate[c]|| Abbreviate a key sequence +
 ||[c]:abclear[c]|| Remove all abbreviations +
@@ -184,7 +215,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:forward[c]|| Go forward in the browser history +
 ||[c]:hardcopy[c]|| Print current document +
 ||[c]:help[c]|| Display help +
-||[c]:highlight[c]|| Style Vimperator +
+||[c]:highlight[c]|| Style Xulmus +
 ||[c]:history[c]|| Show recently visited URLs +
 ||[c]:iabbrev[c]|| Abbreviate a key sequence in Insert mode +
 ||[c]:iabclear[c]|| Remove all abbreviations in Insert mode +
@@ -203,7 +234,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:mark[c]|| Mark current location within the web page +
 ||[c]:marks[c]|| Show all location marks of current web page +
 ||[c]:messages[c]|| Display previously given messages +
-||[c]:mkvimperatorrc[c]|| Write current key mappings and changed options to the config file +
+||[c]:mkxulmusrc[c]|| Write current key mappings and changed options to the config file +
 ||[c]:nohlsearch[c]|| Remove the search highlighting +
 ||[c]:noremap[c]|| Map a key sequence without remapping keys +
 ||[c]:normal[c]|| Execute Normal mode commands +
@@ -212,7 +243,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:pageinfo[c]|| Show various page information +
 ||[c]:pagestyle[c]|| Select the author style sheet to apply +
 ||[c]:play[c]|| Replay a recorded macro +
-||[c]:preferences[c]|| Show Firefox preferences dialog +
+||[c]:preferences[c]|| Show Songbird preferences dialog +
 ||[c]:pwd[c]|| Print the current directory name +
 ||[c]:qmark[c]|| Mark a URL with a letter for quick access +
 ||[c]:qmarks[c]|| Show all QuickMarks +
@@ -230,7 +261,7 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:setglobal[c]|| Set global option +
 ||[c]:setlocal[c]|| Set local option +
 ||[c]:sidebar[c]|| Open the sidebar window +
-||[c]:style[c]|| Style Vimperator and web sites +
+||[c]:style[c]|| Style Xulmus and web sites +
 ||[c]:source[c]|| Read Ex commands from a file +
 ||[c]:stop[c]|| Stop loading +
 ||[c]:tab[c]|| Execute a command and tell it to output in a new tab +
diff --git a/xulmus/locale/en-US/intro.txt b/xulmus/locale/en-US/intro.txt
index 98c9a70d..4692276f 100755
--- a/xulmus/locale/en-US/intro.txt
+++ b/xulmus/locale/en-US/intro.txt
@@ -1,31 +1,25 @@
 LOGO
 
-+++<div style="text-align: center;">+++
-*First there was a Navigator, then there was an Explorer.
-Later it was time for a Konqueror. Now it's time for an Imperator, the
-VIMperator :)*
-+++</div>+++
-
 section:Introduction[intro]
 
-http://vimperator.org[Vimperator] is a free browser add-on for Firefox,
-which makes it look and behave like the http://www.vim.org[Vim]
-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.
+http://vimperator.org/Xulmus[Xulmus] is a free media player add-on for
+Songbird, which combines the best features of the
+http://cmus.sourceforge.net[cmus] music player and the http://www.vim.org[Vim]
+text editor.
 
 |warning| +
 Warning:
-To provide the most authentic Vim experience, the Firefox menubar and toolbar
-are hidden. +
-If you really need them, type: [c]:set guioptions+=mT[c] to get them back. +
-If you don't like Vimperator at all, you can uninstall it by typing
+To provide the most authentic cmus/Vim experience, the Songbird toolbar
+is hidden. +
+If you really need it, type: [c]:set guioptions+=T[c] to get it back. +
+If you don't like Xulmus at all, you can uninstall it by typing
 [c]:addons[c] and remove/disable it. +
 If you like it but can't remember the shortcuts, then press [m]F1[m] or
 [c]:help[c] to get this help window back.
 
 |author| |donation| +
-Vimperator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott].
-If you appreciate my work on Vimperator and want to encourage me working on it
+Xulmus was written by mailto:prathyushthota@gmail.com[Prathyush Thota].
+If you appreciate my work on Xulmus and want to encourage me working on it
 more, you can either send me greetings, patches or make a donation:
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -38,14 +32,15 @@ more, you can either send me greetings, patches or make a donation:
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 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
+if you really like Xulmus and the money doesn't hurt -- otherwise just use
 it, recommend it and like it :)
 
 section:Help{nbsp}topics[overview]
 
-- help:Tutorial[tutorial.html]: A quick-start tutorial for new users.
-- help:Initialization[starting.html]: How Vimperator starts up, where it reads
+//- help:Tutorial[tutorial.html]: A quick-start tutorial for new users.
+- help:Initialization[starting.html]: How Xulmus starts up, where it reads
   the config file...
+- help:Player[player.html]: Interacting with the media player.
 - help:Browsing[browsing.html]: Basic mappings and commands needed for a
   browsing session (how to open a web page or go back in history).
 - help:Buffer{nbsp}commands[buffer.html]: Operations on the current document
@@ -65,8 +60,8 @@ section:Help{nbsp}topics[overview]
 - help:Autocommands[autocommands.html]: Automatically executing code on certain
   events.
 - help:Print[print.html]: Printing pages.
-- help:GUI[gui.html]: Accessing Firefox menus, dialogs and the sidebar.
-- help:Styling[styling.html]: Changing the styling of content pages and Vimperator itself.
+- help:GUI[gui.html]: Accessing Songbird menus, dialogs and the sidebar.
+- help:Styling[styling.html]: Changing the styling of content pages and Xulmus itself.
 - help:Messages[message.html]: A description of messages and error messages.
 - help:Developer{nbsp}information[developer.html]: How to write docs or
   plugins.
@@ -87,11 +82,11 @@ section:Features[features]
 * Advanced completion of bookmark and history URLs (searching also in title, not only URL)
 * Vim-like statusline with a wget-like progress bar
 * Minimal GUI (easily hide useless menubar and toolbar with [c]:set guioptions=[c])
-* Ability to [c]:source[c] JavaScript files, and to use a [a]~/.vimperatorrc[a] file
-  with syntax highlighting if you install scripts/vimperator.vim
+* Ability to [c]:source[c] JavaScript files, and to use a [a]~/.xulmusrc[a] file
+  with syntax highlighting if you install scripts/xulmus.vim
 * Easy quick searches ([c]:open foo[c] will search for "foo" in google,
   [c]:open ebay terminator[c] will search for "terminator" on ebay)
-  with support for Firefox keyword bookmarks and search engines
+  with support for Songbird keyword bookmarks and search engines
 * Count supported for many commands ([m]3<C-o>[m] will go back 3 pages)
 * Beep on errors
 * Marks support ([m]ma[m] to set mark a on a web page, [m]'a[m] to go there)
diff --git a/xulmus/locale/en-US/map.txt b/xulmus/locale/en-US/map.txt
index 4e9af03a..1fd2621c 100755
--- a/xulmus/locale/en-US/map.txt
+++ b/xulmus/locale/en-US/map.txt
@@ -172,7 +172,7 @@ ________________________________________________________________________________
 
 section:Abbreviations[abbreviations]
 
-Vimperator can automatically replace words identified as abbreviations,
+Xulmus can automatically replace words identified as abbreviations,
 which may be used to save typing or to correct commonly misspelled
 words. An abbreviation can be one of three types that are defined by the
 types of constituent characters. Whitespace and quotes are non-keyword
@@ -319,7 +319,7 @@ Completion can be enabled by specifying one of the following arguments to the
 *buffer*         buffers
 *color*          color schemes
 *command*        Ex commands
-*dialog*         Firefox dialogs
+*dialog*         Songbird dialogs
 *dir*            directories
 *environment*    environment variables
 *event*          autocommand events
@@ -330,8 +330,8 @@ Completion can be enabled by specifying one of the following arguments to the
 *macro*          named macros
 *mapping*        user mappings
 *menu*           menu items
-*option*         Vimperator options
-*preference*     Firefox preferences
+*option*         Xulmus options
+*preference*     Songbird preferences
 *search*         search engines and keywords
 *shellcmd*       shell commands
 *sidebar*        sidebar panels
diff --git a/xulmus/locale/en-US/marks.txt b/xulmus/locale/en-US/marks.txt
index 837268be..d1a7a5b5 100755
--- a/xulmus/locale/en-US/marks.txt
+++ b/xulmus/locale/en-US/marks.txt
@@ -2,14 +2,14 @@ HEADER
 
 |different-marks| |marks| +
 
-Vimperator supports a number of different marks:
+Xulmus supports a number of different marks:
 
 - Bookmarks which allow you to mark a web page as one of your favorites for
   easy access.
 - QuickMarks allow you to define up to 62 (a-zA-Z0-9) web sites (or groups of
   web sites) which you visit most often.
 - Local marks to store the position within a web page.
-- History is also a special type of marks, as Vimperator automatically
+- History is also a special type of marks, as Xulmus automatically
   remembers sites which you have visited in the past.
 
 section:Bookmarks[bookmarks]
diff --git a/xulmus/locale/en-US/message.txt b/xulmus/locale/en-US/message.txt
index 99c1d723..04270207 100755
--- a/xulmus/locale/en-US/message.txt
+++ b/xulmus/locale/en-US/message.txt
@@ -2,7 +2,7 @@ HEADER
 
 |message-history| +
 
-Vimperator stores all info and error messages in a message history. The type of
+Xulmus stores all info and error messages in a message history. The type of
 info messages output can be controlled by the 'verbose' option.
 
 |:mes| |:messages| +
diff --git a/xulmus/locale/en-US/pattern.txt b/xulmus/locale/en-US/pattern.txt
index 6462a897..0009d6ff 100755
--- a/xulmus/locale/en-US/pattern.txt
+++ b/xulmus/locale/en-US/pattern.txt
@@ -2,9 +2,9 @@ HEADER
 
 |text-search-commands| +
 
-Vimperator provides a Vim-like interface to Firefox's standard text search
+Xulmus provides a Vim-like interface to Songbird's standard text search
 functionality. There is no support for using regular expressions in search
-commands as Firefox does not provide native regexp support. It is unlikely that
+commands as Songbird does not provide native regexp support. It is unlikely that
 this will ever be available.
 
 |/| +
diff --git a/xulmus/locale/en-US/print.txt b/xulmus/locale/en-US/print.txt
index 8cf3d180..9002f9b9 100755
--- a/xulmus/locale/en-US/print.txt
+++ b/xulmus/locale/en-US/print.txt
@@ -18,7 +18,7 @@ As above, but write the output to {filename}.
 Note: Not available on Windows.
 ________________________________________________________________________________
 
-section:Firefox{nbsp}printing{nbsp}dialogs[firefox-print-dialogs]
+section:Songbird{nbsp}printing{nbsp}dialogs[songbird-print-dialogs]
 
 The "Print Preview" and "Page Setup" dialogs can be opened via the [c]:dialog[c]
 command
diff --git a/xulmus/locale/en-US/repeat.txt b/xulmus/locale/en-US/repeat.txt
index 2817c980..493d6b26 100755
--- a/xulmus/locale/en-US/repeat.txt
+++ b/xulmus/locale/en-US/repeat.txt
@@ -2,7 +2,7 @@ HEADER
 
 |repeat| +
 
-Vimperator can repeat a number of commands and record macros.
+Xulmus can repeat a number of commands and record macros.
 
 section:Macros[macros,complex-repeat]
 
@@ -52,7 +52,7 @@ ____________________________________________________________________________
 ||[count].||
 ____________________________________________________________________________
 Repeat the last keyboard mapping [count] times. Note that, unlike in Vim, this
-does not apply solely to editing commands, mainly because Vimperator doesn't
+does not apply solely to editing commands, mainly because Xulmus doesn't
 have them.
 ____________________________________________________________________________
 
@@ -99,7 +99,7 @@ Load all unloaded plugins immediately. Because plugins are automatically
 loaded after vimperatorrc is sourced, this command must be placed early
 in the vimperatorrc file if vimperatorrc also includes commands that are
 implemented by plugins. Additionally, this command allows for sourcing
-new plugins without restarting Vimperator.
+new plugins without restarting Xulmus.
 ________________________________________________________________________________
 
 
@@ -123,7 +123,7 @@ ________________________________________________________________________________
 |:fini| |:finish|
 ||:fini[sh]|| +
 ________________________________________________________________________________
-Stop sourcing a script file. This can only be called from within a Vimperator
+Stop sourcing a script file. This can only be called from within a Xulmus
 script file.
 ________________________________________________________________________________
 
@@ -136,7 +136,7 @@ Profile a piece of code or a command. Run {code} [count] times (default 1)
 and returns the elapsed time. {code} is always passed to JavaScript's eval(),
 which might be slow, so take the results with a grain of salt.
 
-If {code} starts with a [c]:[c], it is executed as a Vimperator command.
+If {code} starts with a [c]:[c], it is executed as a Xulmus command.
 
 Use the special version with [!] if you just want to run any command multiple
 times without showing profiling statistics.
diff --git a/xulmus/locale/en-US/starting.txt b/xulmus/locale/en-US/starting.txt
index df384fd0..552c6ce2 100755
--- a/xulmus/locale/en-US/starting.txt
+++ b/xulmus/locale/en-US/starting.txt
@@ -1,13 +1,13 @@
 HEADER
 
-Vimperator does not yet read any command-line options. When it does, they will
+Xulmus does not yet read any command-line options. When it does, they will
 be documented here.
 
 section:Initialization[initialization,startup]
 
-At startup, Vimperator completes the following tasks in order.
+At startup, Xulmus completes the following tasks in order.
 
-1. Vimperator can perform user initialization commands. When
+1. Xulmus can perform user initialization commands. When
 one of the following is successfully located, it is executed, and no
 further locations are tried.
 
@@ -31,7 +31,7 @@ command).
 The user's ~ (i.e., "home") directory is determined as follows:
 
 * On Unix and Mac, the environment variable  _$HOME_ is used.
-* On Windows, Vimperator checks for the existence of _%HOME%_, then
+* On Windows, Xulmus checks for the existence of _%HOME%_, then
 _%USERPROFILE%_, and then _%HOMEDRIVE%%HOMEPATH%_. It uses the first one
 it finds.
 
@@ -54,7 +54,7 @@ section:Restarting[restarting]
 |:res| |:restart| +
 ||:res[tart]||
 ________________________________________________________________________________
-Force the browser to restart. Useful when installing extensions.
+Force Xulmus to restart. Useful when installing extensions.
 ________________________________________________________________________________
 
 // vim: set filetype=asciidoc:
diff --git a/xulmus/locale/en-US/styling.txt b/xulmus/locale/en-US/styling.txt
index a4ba91a2..213ec61c 100755
--- a/xulmus/locale/en-US/styling.txt
+++ b/xulmus/locale/en-US/styling.txt
@@ -2,7 +2,7 @@ HEADER
 
 |styling| +
 
-Vimperator allows you to style both the browser and any web pages you view. All
+Vimperator allows you to style both the player and any web pages you view. All
 styling is specified via CSS. Although you may style any user interface element
 via the [c]:style[c] command, most Vimperator elements can be styled with the
 [c]:highlight[c] command, for convenience.
@@ -102,7 +102,7 @@ ________________________________________________________________________________
 |:sty| |:style| +
 ||:sty[le][!] [-name={name}] [-append] {filter} [{css}]|| +
 ________________________________________________________________________________
-Add CSS styles to the browser or to web pages. {filter} is a comma
+Add CSS styles to the player or to web pages. {filter} is a comma
 separated list of URLs to match. URLs ending with *\** are matched as
 prefixes, URLs not containing any *:* or */* characters are
 matched as domains. If {name} (short option: [c]-n[c]) is provided, any
diff --git a/xulmus/locale/en-US/tabs.txt b/xulmus/locale/en-US/tabs.txt
index 9ccded72..6b267edb 100755
--- a/xulmus/locale/en-US/tabs.txt
+++ b/xulmus/locale/en-US/tabs.txt
@@ -199,20 +199,21 @@ Like [m]d[m] but selects the tab to the left of the deleted tab.
 ________________________________________________________________________________
 
 
-|u| |:u| |:undo|
-||:[count]u[ndo] [a][url][a]|| +
-||[count]u||
-________________________________________________________________________________
-Undo closing of a tab. If a count is given, don't undo the last but the
-[count]th last closed tab. With [a][url][a] restores the tab matching the URL.
-________________________________________________________________________________
-
-
-|:undoa| |:undoall| +
-||:undoa[ll]||
-________________________________________________________________________________
-Undo closing of all closed tabs. Firefox stores up to 10 closed tabs, even
-after a browser restart.
-________________________________________________________________________________
+// FIXME: No undo in Songbird for now.
+//|u| |:u| |:undo|
+//||:[count]u[ndo] [a][url][a]|| +
+//||[count]u||
+//________________________________________________________________________________
+//Undo closing of a tab. If a count is given, don't undo the last but the
+//[count]th last closed tab. With [a][url][a] restores the tab matching the URL.
+//________________________________________________________________________________
+//
+//
+//|:undoa| |:undoall| +
+//||:undoa[ll]||
+//________________________________________________________________________________
+//Undo closing of all closed tabs. Songbird stores up to 10 closed tabs, even
+//after a browser restart.
+//________________________________________________________________________________
 
 // vim: set filetype=asciidoc:
diff --git a/xulmus/locale/en-US/various.txt b/xulmus/locale/en-US/various.txt
index 79d485dc..65e315b9 100755
--- a/xulmus/locale/en-US/various.txt
+++ b/xulmus/locale/en-US/various.txt
@@ -34,14 +34,14 @@ Run a command. Runs {cmd} through system() and displays its output. Any \'!' in
 backslash before the \'!', then that backslash is removed.
 
 Warning: Input redirection (< foo) not done, also do not run commands which
-require stdin or it will hang Firefox!
+require stdin or it will hang Songbird!
 ________________________________________________________________________________
 
 
 |:ve| |:version| +
 ||:ve[rsion][!]||
 ________________________________________________________________________________
-Show version information. You can show the Firefox version page with
+Show version information. You can show the Songbird version page with
 [c]:version![c].
 ________________________________________________________________________________
 

From 6c598b757452f6194a85afa9ff9479e9967fec7b Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 02:16:10 +1100
Subject: [PATCH 109/143] Add TODO regarding missing multi-window
 functionality.

---
 xulmus/TODO | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xulmus/TODO b/xulmus/TODO
index 16d91ee8..f07206ab 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -10,6 +10,7 @@ BUGS:
     Is this workable anyway? --djk
   - <C-^> is off by one when alternating with the media tab
   - numbered tabs
+  - :winopen
 
 FEATURES:
 9 '?' - Reusing '/'. 

From 887855ed01e69fffb5250e7a587c64c3f7f3e46f Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 12:18:28 +1100
Subject: [PATCH 110/143] Fix typo in "/" help text.

---
 xulmus/locale/en-US/player.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 0a807c64..415c61bb 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -178,7 +178,7 @@ section:Search{nbsp}commands[search]
 |/|
 ||/{pattern}<CR>|| +
 ________________________________________________________________________________
-Search for the first occurence of {pattern} in the visible media view.
+Search for the first occurrence of {pattern} in the visible media view.
 ________________________________________________________________________________
 
 |n|

From 0f311e09e3837de341a07b31c17e5f84bdf62b09 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 12:23:22 +1100
Subject: [PATCH 111/143] Whitespace fixes.

---
 xulmus/content/player.js       | 44 +++++++++++++++-------------------
 xulmus/locale/en-US/player.txt |  4 ++--
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 2d8b3c0d..a65e644b 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -1,7 +1,5 @@
 // Import Artist List as this can be huge
 
-
-
 function Player() // {{{
 {
     ////////////////////////////////////////////////////////////////////////////////
@@ -11,11 +9,10 @@ function Player() // {{{
     let lastSearchString = "";
     let lastSearchIndex = 0;
     let lastSearchView = _SBGetCurrentView();
-   
+
     // Get the focus to the visible playlist first
     //window._SBShowMainLibrary();
-    
-    
+
     function getArtistsArray()
     {
         var list = LibraryUtils.mainLibrary;
@@ -49,7 +46,7 @@ function Player() // {{{
             artistCounts[artist] = listener.count;
             i++;
         }
-        
+
         //liberator.dump("Count : "+artistCounts.toSource());
         return artistArray;
     }
@@ -57,7 +54,7 @@ function Player() // {{{
     // Get the artist names before hand.
 
     let artists = getArtistsArray();
-    
+
     const pageService = Components.classes["@songbirdnest.com/Songbird/MediaPageManager;1"]
                                   .getService(Components.interfaces.sbIMediaPageManager);
     // Register Callbacks for searching.
@@ -202,7 +199,7 @@ function Player() // {{{
     mappings.add([modes.PLAYER],
          ["n"], "Find Next",
          function () { player.searchViewAgain(false);});
-    
+
     mappings.add([modes.PLAYER],
          ["N"], "Find Previous",
          function () { player.searchViewAgain(true);});
@@ -211,7 +208,7 @@ function Player() // {{{
     mappings.add([modes.PLAYER],
          ["<C-0>"], "Rate the current media item 0",
          function () { player.rateMediaItem(0); });
-    
+
     mappings.add([modes.PLAYER],
          ["<C-1>"], "Rate the current media item 1",
          function () { player.rateMediaItem(1); });
@@ -231,8 +228,7 @@ function Player() // {{{
     mappings.add([modes.PLAYER],
          ["<C-5>"], "Rate the current media item 5",
          function () { player.rateMediaItem(5); });
-    
-         
+
     ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
@@ -326,7 +322,7 @@ function Player() // {{{
         },
         {
             argCount: "?",
-            completer: function(context, args) completion.playlist(context, args),
+            completer: function (context, args) completion.playlist(context, args),
             literal: 0
         });
 
@@ -598,11 +594,11 @@ function Player() // {{{
                 searchString = args + " " + search;
             else
                 searchString = args;
-            
+
             lastSearchString = searchString;
-            
+
             let mySearchView = LibraryUtils.createStandardMediaListView(mediaItemList, searchString);
-            
+
             if (mySearchView.length)
             {
                 lastSearchView = mySearchView;
@@ -614,7 +610,7 @@ function Player() // {{{
                 liberator.echoerr("E486 Pattern not found: "+searchString, commandline.FORCE_SINGLELINE);
             }
         },
- 
+
         //FIXME: commandline.echo should work --ken
         searchViewAgain: function searchViewAgain(reverse)
         {
@@ -644,17 +640,17 @@ function Player() // {{{
             //FIXME: Implement for "?" --ken
             commandline.echo("/" + lastSearchString, null, commandline.FORCE_SINGLELINE);
             focusTrack(lastSearchView.getItemByIndex(lastSearchIndex));
-            
-        }, 
+
+        },
 
         getPlaylists: function getPlaylists()
         {
             let mainLibrary = LibraryUtils.mainLibrary;
             let playlists = [mainLibrary];
             let listener = {
-                onEnumerationBegin: function() { },
-                onEnumerationEnd: function() { },
-                onEnumeratedItem: function(list, item)
+                onEnumerationBegin: function () { },
+                onEnumerationEnd: function () { },
+                onEnumeratedItem: function (list, item)
                 {
                     // FIXME: why are there null items and duplicates?
                     if (!playlists.some(function (list) list.name == item.name) && item.name != null)
@@ -692,7 +688,7 @@ function Player() // {{{
         rateMediaItem: function rateMediaItem(rating)
         {
             if (gMM.sequencer.currentItem)
-                gMM.sequencer.currentItem.setProperty(SBProperties.rating, rating); 
+                gMM.sequencer.currentItem.setProperty(SBProperties.rating, rating);
         },
 
         getArtists: function getArtists()
@@ -707,7 +703,6 @@ function Player() // {{{
             var items = list.getItemsByProperty(SBProperties.artistName, artist).enumerate();
             var i = 0, j = 0;
 
-
             while (items.hasMoreElements())
             {
                 album = items.getNext().getProperty(SBProperties.albumName);
@@ -750,10 +745,9 @@ function Player() // {{{
 
             return tracksArray;
         }
-        
+
     };
     //}}}
 } // }}}
 
-
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 415c61bb..f12fafe6 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -184,14 +184,14 @@ ________________________________________________________________________________
 |n|
 ||n|| +
 ________________________________________________________________________________
-Find next. Repeats the last search. If the search hits BOTTOM of the view, it 
+Find next. Repeats the last search. If the search hits BOTTOM of the view, it
 continues from TOP.
 ________________________________________________________________________________
 
 |N|
 ||N|| +
 ________________________________________________________________________________
-Find previous. Repeats the last search in the opposite direction. If the search 
+Find previous. Repeats the last search in the opposite direction. If the search
 hits TOP of the view, it continues from BOTTTOM.
 ________________________________________________________________________________
 

From 0863ef897e597f1ee7328d656e902f83fb363bbb Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 16:49:26 +1100
Subject: [PATCH 112/143] Document <C-[0-5]> mappings which change the track
 rating.

---
 xulmus/content/player.js       | 40 ++++++++++------------------------
 xulmus/locale/en-US/index.txt  | 13 +++++++++++
 xulmus/locale/en-US/player.txt | 29 +++++++++++++++++++-----
 3 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index a65e644b..52656a4c 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -193,41 +193,25 @@ function Player() // {{{
          function () { player.decreaseVolume(); });
 
     mappings.add([modes.PLAYER],
-         ["/"], "Search View",
+         ["/"], "Search forward for a track",
          function (args) { commandline.open("/", "", modes.SEARCH_VIEW_FORWARD); });
 
     mappings.add([modes.PLAYER],
-         ["n"], "Find Next",
+         ["n"], "Find the next track",
          function () { player.searchViewAgain(false);});
 
     mappings.add([modes.PLAYER],
-         ["N"], "Find Previous",
+         ["N"], "Find the previous track",
          function () { player.searchViewAgain(true);});
 
-    //FIXME: Better way to do this ? --ken
-    mappings.add([modes.PLAYER],
-         ["<C-0>"], "Rate the current media item 0",
-         function () { player.rateMediaItem(0); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-1>"], "Rate the current media item 1",
-         function () { player.rateMediaItem(1); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-2>"], "Rate the current media item 2",
-         function () { player.rateMediaItem(2); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-3>"], "Rate the current media item 3",
-         function () { player.rateMediaItem(3); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-4>"], "Rate the current media item 4",
-         function () { player.rateMediaItem(4); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-5>"], "Rate the current media item 5",
-         function () { player.rateMediaItem(5); });
+    for (let i in util.range(0, 6))
+    {
+        let (rating = i) {
+            mappings.add([modes.PLAYER],
+                 ["<C-" + rating + ">"], "Rate the current media item " + rating,
+                 function () { player.rateMediaItem(rating); });
+        }
+    }
 
     ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
@@ -627,7 +611,7 @@ function Player() // {{{
             }
             else
             {
-                if (lastSearchIndex == (lastSearchView.length -1))
+                if (lastSearchIndex == (lastSearchView.length - 1))
                 {
                     //commandline.echo("Search hit BOTTOM, continuing at TOP",
                     //      commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index ce56d602..c7fabf5b 100755
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -23,6 +23,19 @@ section:Player{nbsp}mode[player-index]
 ||[m]+[m]|| Increase volume by 10% +
 ||[m]-[m]|| Decrease volume by 10% +
 
+||[m]/[m]|| Search forward for a track +
+//||[m]?[m]|| Search backward for a track +
+||[m]n[m]|| Find the next track +
+||[m]N[m]|| Find the previous track +
+
+// TODO: better formatting
+||<C-0>|| Rate the current track with 0 stars +
+||<C-1>|| Rate the current track with 1 stars +
+||<C-2>|| Rate the current track with 2 stars +
+||<C-3>|| Rate the current track with 3 stars +
+||<C-4>|| Rate the current track with 4 stars +
+||<C-5>|| Rate the current track with 5 stars +
+
 section:Insert{nbsp}mode[insert-index]
 
 ||[m]<C-i>[m]|| Launch the external editor +
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index f12fafe6..55a8039e 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -178,21 +178,40 @@ section:Search{nbsp}commands[search]
 |/|
 ||/{pattern}<CR>|| +
 ________________________________________________________________________________
-Search for the first occurrence of {pattern} in the visible media view.
+Search forward for a track matching {pattern} in the visible media view.
 ________________________________________________________________________________
 
+//|?|
+//||?{pattern}<CR>|| +
+//________________________________________________________________________________
+//Search backwards for a track matching {pattern} in the visible media view.
+//________________________________________________________________________________
+
 |n|
 ||n|| +
 ________________________________________________________________________________
-Find next. Repeats the last search. If the search hits BOTTOM of the view, it
-continues from TOP.
+Find the next track. Repeats the last search. If the search hits BOTTOM of the
+view, it continues from TOP.
 ________________________________________________________________________________
 
 |N|
 ||N|| +
 ________________________________________________________________________________
-Find previous. Repeats the last search in the opposite direction. If the search
-hits TOP of the view, it continues from BOTTTOM.
+Find the previous track. Repeats the last search in the opposite direction. If
+the search hits TOP of the view, it continues from BOTTTOM.
+________________________________________________________________________________
+
+section:Rating{nbsp}track[rating]
+
+|<C-5>| |<C-4>| |<C-3>| |<C-2>| |<C-1>| |<C-0>|
+||<C-0>|| +
+||<C-1>|| +
+||<C-2>|| +
+||<C-3>|| +
+||<C-4>|| +
+||<C-5>|| +
+________________________________________________________________________________
+Rate the current track with N stars.
 ________________________________________________________________________________
 
 // vim: set filetype=asciidoc:

From 4fc5a26888ab47c1c2ebcd197b9021e2cdb9ac95 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 20:30:40 +1100
Subject: [PATCH 113/143] Fix typo.

---
 xulmus/locale/en-US/player.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index 55a8039e..ab9d5a0f 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -201,7 +201,7 @@ Find the previous track. Repeats the last search in the opposite direction. If
 the search hits TOP of the view, it continues from BOTTTOM.
 ________________________________________________________________________________
 
-section:Rating{nbsp}track[rating]
+section:Rating{nbsp}tracks[rating]
 
 |<C-5>| |<C-4>| |<C-3>| |<C-2>| |<C-1>| |<C-0>|
 ||<C-0>|| +

From de38813fce7d53d663e0a7609803bf6dd9d179f9 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 20:34:24 +1100
Subject: [PATCH 114/143] cmus -> CMus in help references.

---
 xulmus/locale/en-US/intro.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xulmus/locale/en-US/intro.txt b/xulmus/locale/en-US/intro.txt
index 4692276f..490f00c9 100755
--- a/xulmus/locale/en-US/intro.txt
+++ b/xulmus/locale/en-US/intro.txt
@@ -4,12 +4,12 @@ section:Introduction[intro]
 
 http://vimperator.org/Xulmus[Xulmus] is a free media player add-on for
 Songbird, which combines the best features of the
-http://cmus.sourceforge.net[cmus] music player and the http://www.vim.org[Vim]
+http://cmus.sourceforge.net[CMus] music player and the http://www.vim.org[Vim]
 text editor.
 
 |warning| +
 Warning:
-To provide the most authentic cmus/Vim experience, the Songbird toolbar
+To provide the most authentic CMus/Vim experience, the Songbird toolbar
 is hidden. +
 If you really need it, type: [c]:set guioptions+=T[c] to get it back. +
 If you don't like Xulmus at all, you can uninstall it by typing

From 58dd4c2e77c017de66c19f536932385b631c32b9 Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 16:27:18 +0530
Subject: [PATCH 115/143] Fixed Initialization section in Help

---
 xulmus/locale/en-US/starting.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xulmus/locale/en-US/starting.txt b/xulmus/locale/en-US/starting.txt
index 552c6ce2..b32bddbd 100755
--- a/xulmus/locale/en-US/starting.txt
+++ b/xulmus/locale/en-US/starting.txt
@@ -11,12 +11,12 @@ At startup, Xulmus completes the following tasks in order.
 one of the following is successfully located, it is executed, and no
 further locations are tried.
 
-  a. |$VIMPERATOR_INIT|
-     _$VIMPERATOR_INIT_ -- May contain a single Ex command (e.g.,
+  a. |$XULMUS_INIT|
+     _$XULMUS_INIT_ -- May contain a single Ex command (e.g.,
                            "[c]:source {file}[c]").
-  b. [a]\~/_vimperatorrc[a] -- Windows only. If this file exists, its contents
+  b. [a]\~/_xulmusrc[a] -- Windows only. If this file exists, its contents
 	are executed.
-  c. [a]\~/.vimperatorrc[a] -- If this file exists, its contents are executed.
+  c. [a]\~/.xulmusrc[a] -- If this file exists, its contents are executed.
 
 2. If 'exrc' is set, then any RC file in the current directory is also sourced.
 
@@ -37,12 +37,12 @@ it finds.
 
 section:Saving{nbsp}settings[save-settings]
 
-|:mkv| |:mkvimperatorrc|
-||:mkv[imperatorrc][!] [a][file][a]|| +
+|:mkx| |:mkxulmusrc|
+||:mkx[ulmusrc][!] [a][file][a]|| +
 ________________________________________________________________________________
 Write current key mappings and changed options to [a][file][a]. If no
-[a][file][a] is specified then _~/.vimperatorrc_ is written unless this file
-already exists. The special version [c]:mkvimperatorrc![c] will overwrite
+[a][file][a] is specified then _~/.xulmusrc_ is written unless this file
+already exists. The special version [c]:mkxulmusrc![c] will overwrite
 [a][file][a] if it exists.
 
 Warning: this differs from Vim's behavior which defaults to writing the file

From d06e27ca57e8b262e27166c00f6527473f4cd35f Mon Sep 17 00:00:00 2001
From: Prathyush Thota <prathyushthota@gmail.com>
Date: Sat, 28 Mar 2009 21:27:14 +0530
Subject: [PATCH 116/143] Version 0.1 & NEWS

---
 xulmus/Makefile | 2 +-
 xulmus/NEWS     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xulmus/Makefile b/xulmus/Makefile
index b161489d..118bb65e 100755
--- a/xulmus/Makefile
+++ b/xulmus/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.1pre
+VERSION       = 0.1
 NAME          = xulmus
 
 include ../common/Makefile.common
diff --git a/xulmus/NEWS b/xulmus/NEWS
index 9260c32d..2f613fd3 100755
--- a/xulmus/NEWS
+++ b/xulmus/NEWS
@@ -1,2 +1,3 @@
-2009-XX-XX:
-    * version 0.1 (probably)
+2009-03-28:
+    * version 0.1
+    * first public release

From 09c653062c9cc1d170917903e8227d15ef58f5ed Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Sat, 28 Mar 2009 23:10:10 +0100
Subject: [PATCH 117/143] Remove text shadow, should fix tabs on mac os

---
 common/content/bindings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/content/bindings.xml b/common/content/bindings.xml
index 09693199..d2fd0254 100644
--- a/common/content/bindings.xml
+++ b/common/content/bindings.xml
@@ -47,11 +47,9 @@
                     </xul:vbox>
                 </xul:stack>
                 <xul:stack class="tab-text-stack">
-                    <xul:label xbl:inherits="value=ordinal" class="tab-text-shadow" liberator:highlight="TabNumber"/>
                     <xul:label xbl:inherits="value=ordinal" class="tab-text" liberator:highlight="TabNumber"/>
                 </xul:stack>
                 <xul:stack class="tab-text-stack" flex="1">
-                    <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text-shadow"/>
                     <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
                 </xul:stack>
             </xul:hbox>

From 5ab1771e3c00fa4861d7f933f6efeedd47829880 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@vimperator.org>
Date: Sat, 28 Mar 2009 23:38:33 +0100
Subject: [PATCH 118/143] changed my email address

---
 License.txt                            |   2 +-
 common/content/buffer.js               |   2 +-
 common/content/commands.js             |   2 +-
 common/content/completion.js           |   2 +-
 common/content/editor.js               |   2 +-
 common/content/events.js               |   2 +-
 common/content/find.js                 |   2 +-
 common/content/help.css                |   2 +-
 common/content/hints.js                |   2 +-
 common/content/io.js                   |   2 +-
 common/content/liberator.js            |   2 +-
 common/content/liberator.xul           |   2 +-
 common/content/mappings.js             |   2 +-
 common/content/modes.js                |   2 +-
 common/content/options.js              |   2 +-
 common/content/tabs.js                 |   2 +-
 common/content/template.js             |   2 +-
 common/content/ui.js                   |   2 +-
 common/content/util.js                 |   2 +-
 common/skin/liberator.css              |   2 +-
 muttator/AUTHORS                       |   2 +-
 muttator/License.txt                   |   2 +-
 muttator/content/compose/compose.xul   |   2 +-
 muttator/content/compose/liberator.xul | 120 ++++++++++++++++++++++++-
 muttator/content/config.js             |   2 +-
 muttator/content/mail.js               |   2 +-
 muttator/content/muttator.xul          |   2 +-
 muttator/locale/en-US/asciidoc.conf    |   2 +-
 muttator/locale/en-US/intro.txt        |   2 +-
 vimperator/AUTHORS                     |   2 +-
 vimperator/Makefile                    |   2 +-
 vimperator/content/bookmarks.js        |   2 +-
 vimperator/content/config.js           |   2 +-
 vimperator/content/vimperator.xul      |   2 +-
 vimperator/locale/en-US/asciidoc.conf  |   2 +-
 vimperator/locale/en-US/intro.txt      |   2 +-
 36 files changed, 154 insertions(+), 36 deletions(-)
 mode change 120000 => 100644 muttator/content/compose/liberator.xul

diff --git a/License.txt b/License.txt
index 7efdb050..39f969f2 100644
--- a/License.txt
+++ b/License.txt
@@ -10,7 +10,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/buffer.js b/common/content/buffer.js
index a9cb4831..237e2930 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/commands.js b/common/content/commands.js
index d6417a23..6cc8ab97 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/completion.js b/common/content/completion.js
index 5c8e9d2d..16e1d1a4 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/editor.js b/common/content/editor.js
index 59d1c9dd..073e88cf 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/events.js b/common/content/events.js
index 51d1ecb8..8d5dfe29 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/find.js b/common/content/find.js
index 90a73868..89ebcb1f 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/help.css b/common/content/help.css
index 67bdba86..c8107467 100644
--- a/common/content/help.css
+++ b/common/content/help.css
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/hints.js b/common/content/hints.js
index 5e27d0c4..c263ae30 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/io.js b/common/content/io.js
index ffebc794..bc0d1a15 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
     Code based on venkman
 
 Alternatively, the contents of this file may be used under the terms of
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 9c0b2279..188bb145 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/liberator.xul b/common/content/liberator.xul
index e7609f52..d26700a7 100644
--- a/common/content/liberator.xul
+++ b/common/content/liberator.xul
@@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/mappings.js b/common/content/mappings.js
index 0f222d64..26864c2b 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/modes.js b/common/content/modes.js
index b00ec691..5166e3e8 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/options.js b/common/content/options.js
index 1442ce23..fb9bbeae 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 3d44fbcb..d990a346 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/template.js b/common/content/template.js
index ea6cf3a1..9f4df824 100644
--- a/common/content/template.js
+++ b/common/content/template.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/ui.js b/common/content/ui.js
index 56abd03b..4048bcb8 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/content/util.js b/common/content/util.js
index 24a167e2..ce1705d4 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/common/skin/liberator.css b/common/skin/liberator.css
index 677adbef..c4475f59 100644
--- a/common/skin/liberator.css
+++ b/common/skin/liberator.css
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/muttator/AUTHORS b/muttator/AUTHORS
index cdad350d..763ced8e 100644
--- a/muttator/AUTHORS
+++ b/muttator/AUTHORS
@@ -1,5 +1,5 @@
 Main developer/Project founder:
-  * Martin Stubenschrott (stubenschrott@gmx.net)
+  * Martin Stubenschrott (stubenschrott@vimperator.org)
 
 Developers:
   * Daniel Bainton (dpb .AT. driftaway .DOT. org)
diff --git a/muttator/License.txt b/muttator/License.txt
index 7efdb050..39f969f2 100644
--- a/muttator/License.txt
+++ b/muttator/License.txt
@@ -10,7 +10,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/muttator/content/compose/compose.xul b/muttator/content/compose/compose.xul
index f7466a7a..a0db3f57 100644
--- a/muttator/content/compose/compose.xul
+++ b/muttator/content/compose/compose.xul
@@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/muttator/content/compose/liberator.xul b/muttator/content/compose/liberator.xul
deleted file mode 120000
index e6fca064..00000000
--- a/muttator/content/compose/liberator.xul
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/content/liberator.xul
\ No newline at end of file
diff --git a/muttator/content/compose/liberator.xul b/muttator/content/compose/liberator.xul
new file mode 100644
index 00000000..d26700a7
--- /dev/null
+++ b/muttator/content/compose/liberator.xul
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ***** 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.
+
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
+
+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 ***** -->
+
+<?xml-stylesheet href="chrome://liberator/skin/liberator.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "liberator.dtd" [
+    <!ENTITY liberator.content "chrome://liberator/content/">
+]>
+
+<overlay id="liberator"
+    xmlns:liberator="http://vimperator.org/namespaces/liberator"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:nc="http://home.netscape.com/NC-rdf#"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <script type="application/x-javascript;version=1.8" src="&liberator.content;liberator-overlay.js"/>
+
+    <window id="&liberator.mainWindow;">
+
+        <keyset id="mainKeyset">
+            <key id="key_open_vimbar" key=":" oncommand="liberator.modules.commandline.open(':', '', liberator.modules.modes.EX);" modifiers=""/>
+            <key id="key_stop" keycode="VK_ESCAPE" oncommand="liberator.modules.events.onEscape();"/>
+            <!-- other keys are handled inside the event loop in events.js -->
+        </keyset>
+
+        <popupset>
+            <panel id="liberator-visualbell" liberator:highlight="Bell"/>
+        </popupset>
+
+        <!--this notifies us also of focus events in the XUL
+            from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
+        <commandset id="onVimperatorFocus"
+            commandupdater="true"
+            events="focus"
+            oncommandupdate="if (liberator.modules.events != undefined) liberator.modules.events.onFocusChange(event);"/>
+        <commandset id="onVimperatorSelect"
+            commandupdater="true"
+            events="select"
+            oncommandupdate="if (liberator.modules.events != undefined) liberator.modules.events.onSelectionChange(event);"/>
+
+        <!-- As of Firefox 3.1pre, <iframe>.height changes do not seem to have immediate effect,
+             therefore we need to put them into a <vbox> for which that works just fine -->
+        <vbox class="liberator-container" hidden="false" collapsed="true">
+            <iframe id="liberator-multiline-output" src="chrome://liberator/content/buffer.xhtml"
+                flex="1" hidden="false" collapsed="false"
+                onclick="liberator.modules.commandline.onMultilineOutputEvent(event)"/>
+        </vbox>
+
+        <vbox class="liberator-container" hidden="false" collapsed="true">
+            <iframe id="liberator-completions" src="chrome://liberator/content/buffer.xhtml"
+                flex="1" hidden="false" collapsed="false"
+                onclick="liberator.modules.commandline.onMultilineOutputEvent(event)"/>
+        </vbox>
+
+        <stack orient="horizontal" align="stretch" class="liberator-container" liberator:highlight="CmdLine">
+            <textbox class="plain" id="liberator-message" flex="1" readonly="true" liberator:highlight="Normal"/>
+            <hbox id="liberator-commandline" hidden="false" collapsed="true" class="liberator-container" liberator:highlight="Normal">
+                <label class="plain" id="liberator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
+                <textbox class="plain" id="liberator-commandline-command" flex="1" type="timed" timeout="100"
+                    oninput="liberator.modules.commandline.onEvent(event);"
+                    onkeyup="liberator.modules.commandline.onEvent(event);"
+                    onfocus="liberator.modules.commandline.onEvent(event);"
+                    onblur="liberator.modules.commandline.onEvent(event);"/>
+            </hbox>
+        </stack>
+
+        <vbox class="liberator-container" hidden="false" collapsed="false">
+            <textbox id="liberator-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
+                onkeypress="liberator.modules.commandline.onMultilineInputEvent(event);"
+                oninput="liberator.modules.commandline.onMultilineInputEvent(event);"
+                onblur="liberator.modules.commandline.onMultilineInputEvent(event);"/>
+        </vbox>
+
+    </window>
+
+    <statusbar id="status-bar" liberator:highlight="StatusLine">
+        <hbox insertbefore="&liberator.statusBefore;" insertafter="&liberator.statusAfter;"
+              id="liberator-statusline" flex="1" hidden="false" align="center">
+            <textbox class="plain" id="liberator-statusline-field-url" readonly="false" flex="1" crop="end"/>
+            <label class="plain" id="liberator-statusline-field-inputbuffer"    flex="0"/>
+            <label class="plain" id="liberator-statusline-field-progress"       flex="0"/>
+            <label class="plain" id="liberator-statusline-field-tabcount"       flex="0"/>
+            <label class="plain" id="liberator-statusline-field-bufferposition" flex="0"/>
+        </hbox>
+        <!-- just hide them since other elements expect them -->
+        <statusbarpanel id="statusbar-display" hidden="true"/>
+        <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
+    </statusbar>
+
+</overlay>
+
+<!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/muttator/content/config.js b/muttator/content/config.js
index 6b1979bb..3b6ee2a2 100644
--- a/muttator/content/config.js
+++ b/muttator/content/config.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/muttator/content/mail.js b/muttator/content/mail.js
index 1e523167..cb720a15 100644
--- a/muttator/content/mail.js
+++ b/muttator/content/mail.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/muttator/content/muttator.xul b/muttator/content/muttator.xul
index 88816d94..1ecc3bbe 100644
--- a/muttator/content/muttator.xul
+++ b/muttator/content/muttator.xul
@@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/muttator/locale/en-US/asciidoc.conf b/muttator/locale/en-US/asciidoc.conf
index 3e4cbefd..8d4fc5ff 100644
--- a/muttator/locale/en-US/asciidoc.conf
+++ b/muttator/locale/en-US/asciidoc.conf
@@ -2,7 +2,7 @@
 
 [glossary]
 author=Martin Stubenschrott
-email=stubenschrott@gmx.net
+email=stubenschrott@vimperator.org
 
 # [header]
 # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
diff --git a/muttator/locale/en-US/intro.txt b/muttator/locale/en-US/intro.txt
index 46930a06..57373e88 100644
--- a/muttator/locale/en-US/intro.txt
+++ b/muttator/locale/en-US/intro.txt
@@ -22,7 +22,7 @@ If you like it, but can't remember the shortcuts, press [m]F1[m] or
 [c]:help[c] to get this help window back.
 
 |author| |donation| +
-Muttator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott].
+Muttator was written by mailto:stubenschrott@vimperator.org[Martin Stubenschrott].
 If you appreciate my work on Muttator and want to encourage me working on it
 more, you can either send me greetings, patches or make a donation:
 
diff --git a/vimperator/AUTHORS b/vimperator/AUTHORS
index d2ec10d5..73e4075d 100644
--- a/vimperator/AUTHORS
+++ b/vimperator/AUTHORS
@@ -1,5 +1,5 @@
 Main developer/Project founder:
-  * Martin Stubenschrott (stubenschrott@gmx.net)
+  * Martin Stubenschrott (stubenschrott@vimperator.org)
 
 Developers:
   * Doug Kearns (dougkearns@gmail.com)
diff --git a/vimperator/Makefile b/vimperator/Makefile
index 5eea2ebb..63e812a0 100644
--- a/vimperator/Makefile
+++ b/vimperator/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 2.0b4pre
+VERSION       = 2.0
 NAME          = vimperator
 
 include ../common/Makefile.common
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index 3a9ad0ec..7e91eacd 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index ab6b0193..9edff1a7 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/vimperator/content/vimperator.xul b/vimperator/content/vimperator.xul
index 75cc8b5c..4350de7f 100644
--- a/vimperator/content/vimperator.xul
+++ b/vimperator/content/vimperator.xul
@@ -13,7 +13,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf
index 4bcc4288..48ffb933 100644
--- a/vimperator/locale/en-US/asciidoc.conf
+++ b/vimperator/locale/en-US/asciidoc.conf
@@ -2,7 +2,7 @@
 
 [glossary]
 author=Martin Stubenschrott
-email=stubenschrott@gmx.net
+email=stubenschrott@vimperator.org
 
 [header]
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/vimperator/locale/en-US/intro.txt b/vimperator/locale/en-US/intro.txt
index ec5156fb..cad25d70 100644
--- a/vimperator/locale/en-US/intro.txt
+++ b/vimperator/locale/en-US/intro.txt
@@ -24,7 +24,7 @@ If you like it but can't remember the shortcuts, then press [m]<F1>[m] or
 [c]:help[c] to get this help window back.
 
 |author| |donation| +
-Vimperator was initially written by mailto:stubenschrott@gmx.net[Martin
+Vimperator was initially written by mailto:stubenschrott@vimperator.org[Martin
 Stubenschrott] but has found many other
 http://vimperator.org/trac/wiki/Vimperator/Authors[contributors] in the
 meanwhile. If you appreciate the work on Vimperator and want to encourage us

From 264b33b608ce8f98a852b90d066aecfcc879fc8f Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@vimperator.org>
Date: Sun, 29 Mar 2009 00:00:27 +0100
Subject: [PATCH 119/143] updated NEWS file

---
 vimperator/NEWS | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vimperator/NEWS b/vimperator/NEWS
index c33ef4b9..a892c7c6 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -1,12 +1,12 @@
-2009-XX-XX:
-    * version 2.0 (probably)
+2009-03-28:
+    * version 2.0
     * IMPORTANT: For compatibility with vim, guioptions=b has been renamed
       'B'. 'b' now represents the bottom scrollbar.
     * IMPORTANT: :set now sets multiple options, as in Vim. Spaces in values
       must be quoted or escaped.
     * IMPORTANT: Due to much improved autocompletion, changed default 'complete' option
-      value to 'sfl', listing intelligent Firefox location bar results. Removed possibility
-      to use 'h' in 'complete'.
+      value to 'sfl', listing intelligent Firefox location bar results. Using 'b' or 'h'
+      might cause problems/massive slowdowns, use with care!
     * IMPORTANT: AlwaysHint mode with ;F mode changed the semantics slightly.
     * IMPORTANT: command actions now take an args object, returned from
       commands.parseArgs, as their first argument. This will break any commands
@@ -45,7 +45,7 @@
     * add 'exrc'
     * add 'errorbells'
     * add shell command completion for :!
-    * add :map <silent> to prevent a mapping from being echoed
+    * add :map <silent> to prevent a mapping from being echoed (might be slow currently, however)
     * add guioptions=nN to number tabs
     * add :loadplugins command
     * add . mapping

From de46ff6c191d86caedeeca75d5aa104c49e0bdcb Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Sun, 29 Mar 2009 01:52:09 +0200
Subject: [PATCH 120/143] Generate the version in install.rdf with 'make xpi'

---
 xulmus/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xulmus/install.rdf b/xulmus/install.rdf
index 3851c0af..b047adb7 100755
--- a/xulmus/install.rdf
+++ b/xulmus/install.rdf
@@ -5,7 +5,7 @@
     <em:id>{3703dcdb-6ba3-4331-8de8-c18373fb05d1}</em:id>
     <em:type>2</em:type>
     <em:name>xulmus@vimperator.org</em:name>
-    <em:version>0.1</em:version>
+    <em:version>###VERSION###</em:version>
     <em:creator>Prathyush Thota</em:creator>
     <em:description>Makes Songbird behave like Vim and CMus.</em:description>
     <em:targetApplication>

From dc9a3e894b33154c91ec4d037b0fb7271b4a8dc7 Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Sun, 29 Mar 2009 01:54:04 +0200
Subject: [PATCH 121/143] Update version to 0.2pre

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

diff --git a/xulmus/Makefile b/xulmus/Makefile
index 118bb65e..ce4f6142 100755
--- a/xulmus/Makefile
+++ b/xulmus/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.1
+VERSION       = 0.2pre
 NAME          = xulmus
 
 include ../common/Makefile.common

From 6adbdb31294af6239b6d289b45217903c522a37e Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Sun, 29 Mar 2009 02:36:04 +0200
Subject: [PATCH 122/143] update version to 2.1a1pre

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

diff --git a/vimperator/Makefile b/vimperator/Makefile
index 63e812a0..165a4b0f 100644
--- a/vimperator/Makefile
+++ b/vimperator/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 2.0
+VERSION       = 2.1a1pre
 NAME          = vimperator
 
 include ../common/Makefile.common

From 44a87ec672bf569f078a664044376ce23e7db6be Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 22:40:27 +1100
Subject: [PATCH 123/143] Fix some missed references to Firefox and Vimperator
 in the help.

---
 xulmus/locale/en-US/gui.txt     | 2 +-
 xulmus/locale/en-US/map.txt     | 6 +++---
 xulmus/locale/en-US/repeat.txt  | 8 ++++----
 xulmus/locale/en-US/styling.txt | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xulmus/locale/en-US/gui.txt b/xulmus/locale/en-US/gui.txt
index 1f19a621..fbebef78 100755
--- a/xulmus/locale/en-US/gui.txt
+++ b/xulmus/locale/en-US/gui.txt
@@ -28,7 +28,7 @@ ________________________________________________________________________________
 
 
 |:dia| |:dialog|
-||:dia[log] [a][firefox-dialog][a]|| +
+||:dia[log] [a][songbird-dialog][a]|| +
 ________________________________________________________________________________
 Open a Songbird dialog.
 
diff --git a/xulmus/locale/en-US/map.txt b/xulmus/locale/en-US/map.txt
index 1fd2621c..cec05288 100755
--- a/xulmus/locale/en-US/map.txt
+++ b/xulmus/locale/en-US/map.txt
@@ -58,7 +58,7 @@ Map the key sequence {lhs} to {rhs}. The {rhs} is remapped, allowing for
 nested and recursive mappings.
 
 Warning: Mappings are NOT saved between sessions, make sure you put them in your
-vimperatorrc file!
+xulmusrc file!
 ________________________________________________________________________________
 
 
@@ -71,7 +71,7 @@ Map the key sequence {lhs} to {rhs} (in Command-line mode). The {rhs} is
 remapped, allowing for nested and recursive mappings.
 
 Warning: Mappings are NOT saved between sessions, make sure you put them in your
-vimperatorrc file!
+xulmusrc file!
 ________________________________________________________________________________
 
 
@@ -84,7 +84,7 @@ Map the key sequence {lhs} to {rhs} (in Insert mode). The {rhs} is remapped,
 allowing for nested and recursive mappings.
 
 Warning: Mappings are NOT saved between sessions, make sure you put them in your
-vimperatorrc file!
+xulmusrc file!
 ________________________________________________________________________________
 
 
diff --git a/xulmus/locale/en-US/repeat.txt b/xulmus/locale/en-US/repeat.txt
index 493d6b26..24c35754 100755
--- a/xulmus/locale/en-US/repeat.txt
+++ b/xulmus/locale/en-US/repeat.txt
@@ -85,8 +85,8 @@ function hello2() {
 --------------------------------------------------------------------------------
 are only available within the scope of the script.
 
-The _.vimperatorrc_ file in your home directory and any files in
-_\~/.vimperator/plugin/_ are always sourced at startup. \~ is supported as a
+The _.xulmusrc_ file in your home directory and any files in
+_\~/.xulmus/plugin/_ are always sourced at startup. \~ is supported as a
 shortcut for the _$HOME_ directory. If [!] is specified, errors are not
 printed.
 ________________________________________________________________________________
@@ -96,8 +96,8 @@ ________________________________________________________________________________
 ||:loadplugins|| +
 ________________________________________________________________________________
 Load all unloaded plugins immediately. Because plugins are automatically
-loaded after vimperatorrc is sourced, this command must be placed early
-in the vimperatorrc file if vimperatorrc also includes commands that are
+loaded after xulmusrc is sourced, this command must be placed early
+in the xulmusrc file if xulmusrc also includes commands that are
 implemented by plugins. Additionally, this command allows for sourcing
 new plugins without restarting Xulmus.
 ________________________________________________________________________________
diff --git a/xulmus/locale/en-US/styling.txt b/xulmus/locale/en-US/styling.txt
index 213ec61c..f3579ec8 100755
--- a/xulmus/locale/en-US/styling.txt
+++ b/xulmus/locale/en-US/styling.txt
@@ -2,9 +2,9 @@ HEADER
 
 |styling| +
 
-Vimperator allows you to style both the player and any web pages you view. All
+Xulmus allows you to style both the player and any web pages you view. All
 styling is specified via CSS. Although you may style any user interface element
-via the [c]:style[c] command, most Vimperator elements can be styled with the
+via the [c]:style[c] command, most Xulmus elements can be styled with the
 [c]:highlight[c] command, for convenience.
 
 |E185| |:colo| |:colorscheme| +
@@ -22,13 +22,13 @@ ________________________________________________________________________________
 ________________________________________________________________________________
 Highlight {group} with {css}. Normally, {css} is checked for
 valid syntax before it's applied. Once you're certain it's
-valid, [!] will override the check, to speed Vimperator startup.
+valid, [!] will override the check, to speed Xulmus startup.
 {selector} can be any valid CSS selector, such as [c]:hover[c], and
 if provided will restrict the match to matching elements.
 
 Valid groups are:
 `--------------------`-----------------------------------
-*Bell*               Vimperator's visual bell
+*Bell*               Xulmus's visual bell
 *Boolean*            A JavaScript Boolean object
 *CmdLine*            The command line
 *CmdOutput*

From 600d8b95b5571a1480ccf965046609907aab80bf Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 22:56:49 +1100
Subject: [PATCH 124/143] Add TODO item regarding Player mode in the Mini
 Player.

---
 xulmus/TODO | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xulmus/TODO b/xulmus/TODO
index f07206ab..9a5e1dcf 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -16,5 +16,6 @@ FEATURES:
 9 '?' - Reusing '/'. 
 8 Playlist/SmartPlaylist operations & meta-data operations.
 7 extended hint mode for opening links in FF.
+5 make Player mode commands work in the Mini-Player.
 5 Check for default extensions and add commands for them. Ex. Last.fm, Seeqpod e.t.c
     Wouldn't these be provided as Xulmus plugins like Vimperator does? --djk

From 58a5b47f639f78261a05579050e1af281fe2768d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 28 Mar 2009 23:22:19 +1100
Subject: [PATCH 125/143] Add the subscription dialog to :dialog.

---
 xulmus/content/config.js    | 4 +++-
 xulmus/locale/en-US/gui.txt | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 248b6a6e..7471d034 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -133,7 +133,9 @@ const config = { //{{{
         ["searchengines",    "Manage installed search engines",
             function () { window.openDialog("chrome://browser/content/search/engineManager.xul", "_blank", "chrome,dialog,modal,centerscreen"); }],
         ["selectionsource",  "View selection source",
-            function () { buffer.viewSelectionSource(); }]
+            function () { buffer.viewSelectionSource(); }],
+        ["subscribe",        "Add a new subscription",
+            function () { SBSubscribe(); }]
     ],
 
     //TODO : Write intro.html and tutorial.html
diff --git a/xulmus/locale/en-US/gui.txt b/xulmus/locale/en-US/gui.txt
index fbebef78..4f2e8972 100755
--- a/xulmus/locale/en-US/gui.txt
+++ b/xulmus/locale/en-US/gui.txt
@@ -52,6 +52,7 @@ Available dialogs:
 *savepage*         Save page to disk
 *searchengines*    Manage installed search engines
 *selectionsource*  View selection source
+*subscribe*        Add a new subscription
 -------------------------------------------------------
 
 ________________________________________________________________________________

From a5c8ebcc5520a3c2ad1ccaf05df462e247917881 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 01:06:38 +1100
Subject: [PATCH 126/143] Add rough :displaypane and :dpclose commands.

---
 xulmus/content/config.js      | 85 +++++++++++++++++++++--------------
 xulmus/locale/en-US/gui.txt   | 15 +++++++
 xulmus/locale/en-US/index.txt |  4 +-
 3 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 7471d034..8d4b2134 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -184,6 +184,31 @@ const config = { //{{{
             liberator.open(pre + newNumberStr + post);
         }
 
+        function openDisplayPane(id)
+        {
+            let pane = document.getElementById(id);
+            let manager = Components.classes['@songbirdnest.com/Songbird/DisplayPane/Manager;1']
+                                    .getService(Components.interfaces.sbIDisplayPaneManager);
+            let paneinfo = manager.getPaneInfo(pane._lastURL.stringValue);
+
+            if (!paneinfo)
+                paneinfo = manager.defaultPaneInfo;
+
+            pane.loadContent(paneinfo);
+        }
+
+        // FIXME: best way to format these args? Hyphenated? One word like :dialog?
+        let displayPanes = {
+            "content pane bottom": "displaypane_contentpane_bottom",
+            "service pane bottom": "displaypane_servicepane_bottom",
+            "right sidebar": "displaypane_right_sidebar"
+        };
+
+        completion.displayPane = function (context) {
+            context.title = ["Display Pane"];
+            context.completions = displayPanes; // FIXME: useful description etc
+        };
+
         // load Xulmus specific modules
         // FIXME: Why aren't these listed in config.scripts?
         // FIXME: Why isn't this automatic? -> how would one know which classes to load where? --mst
@@ -402,50 +427,42 @@ const config = { //{{{
             },
             { argCount: "0" });
 
-        // TODO: service/content pane and right sidebar manipulation commands? --djk
-        /*
-        // TODO: move sidebar commands to ui.js?
-        commands.add(["sbcl[ose]"],
-            "Close the sidebar window",
-            function ()
-            {
-                if (!document.getElementById("sidebar-box").hidden)
-                    toggleSidebar();
-            },
-            { argCount: "0" });
-
-        commands.add(["sideb[ar]", "sb[ar]", "sbope[n]"],
-            "Open the sidebar window",
+        commands.add(["dpcl[ose]"],
+            "Close a display pane",
             function (args)
             {
                 let arg = args.literalArg;
 
-                // focus if the requested sidebar is already open
-                if (document.getElementById("sidebar-title").value == arg)
-                {
-                    document.getElementById("sidebar-box").focus();
-                    return;
-                }
+                if (arg in displayPanes)
+                    document.getElementById(displayPanes[arg]).hide();
+                else
+                    liberator.echoerr("E475: Invalid argument: " + arg);
 
-                let menu = document.getElementById("viewSidebarMenu");
-
-                for (let [,panel] in Iterator(menu.childNodes))
-                {
-                    if (panel.label == arg)
-                    {
-                        panel.doCommand();
-                        return;
-                    }
-                }
-
-                liberator.echoerr("No sidebar " + arg + " found");
             },
             {
                 argCount: "1",
-                completer: function (context) completion.sidebar(context),
+                completer: function (context) completion.displayPane(context),
+                literal: 0
+            });
+
+        // TODO: this should accept a second arg to specify content
+        commands.add(["displayp[ane]", "dp[ane]", "dpope[n]"],
+            "Open a display pane",
+            function (args)
+            {
+                let arg = args.literalArg;
+
+                if (arg in displayPanes)
+                    openDisplayPane(displayPanes[arg])
+                    // TODO: focus when we have better key handling of these extended modes
+                else
+                    liberator.echoerr("E475: Invalid argument: " + arg);
+            },
+            {
+                argCount: "1",
+                completer: function (context) completion.displayPane(context),
                 literal: 0
             });
-        */
 
         commands.add(["winc[lose]", "wc[lose]"],
             "Close window",
diff --git a/xulmus/locale/en-US/gui.txt b/xulmus/locale/en-US/gui.txt
index 4f2e8972..068994cd 100755
--- a/xulmus/locale/en-US/gui.txt
+++ b/xulmus/locale/en-US/gui.txt
@@ -65,4 +65,19 @@ Show progress of current downloads. Open the original Songbird download dialog
 in a new tab. Here, downloads can be paused, canceled and resumed.
 ________________________________________________________________________________
 
+
+|:dpcl| |:dpclose| +
+||:dpcl[ose] {pane}||
+________________________________________________________________________________
+Close the specified display pane.
+________________________________________________________________________________
+
+
+|:dpope| |:dpopen| |:dp| |:dpane| |:dislplayp| |:dislplaypane|
+||:displaypane {pane}|| +
+________________________________________________________________________________
+Open the specified display pane. {pane} is any of "content pane bottom",
+"service pane bottom" or "right sidebar".
+________________________________________________________________________________
+
 // vim: set filetype=asciidoc:
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index c7fabf5b..bb8510bc 100755
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -218,6 +218,8 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:doautoall[c]|| Apply the autocommands matching the specified URL to all buffers +
 ||[c]:doautocmd[c]|| Apply the autocommands matching the specified URL to the current buffer +
 ||[c]:downloads[c]|| Show progress of current downloads +
+||[c]:displaypane[c]|| Open the specified display pane +
+||[c]:dpclose[c]|| Close the specified display pane +
 ||[c]:echo[c]|| Echo the expression +
 ||[c]:echoerr[c]|| Echo the expression as an error message +
 ||[c]:echomsg[c]|| Echo the expression as an informational message +
@@ -268,12 +270,10 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:restart[c]|| Force undefined to restart +
 ||[c]:runtime[c]|| Source the specified file from each directory in 'runtimepath' +
 ||[c]:saveas[c]|| Save current document to disk +
-||[c]:sbclose[c]|| Close the sidebar window +
 ||[c]:scriptnames[c]|| List all sourced script names +
 ||[c]:set[c]|| Set an option +
 ||[c]:setglobal[c]|| Set global option +
 ||[c]:setlocal[c]|| Set local option +
-||[c]:sidebar[c]|| Open the sidebar window +
 ||[c]:style[c]|| Style Xulmus and web sites +
 ||[c]:source[c]|| Read Ex commands from a file +
 ||[c]:stop[c]|| Stop loading +

From 897181a5c476307baa4847a6ec6a60573bfae38c Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 13:50:18 +1100
Subject: [PATCH 127/143] Whitespace fixes.

---
 common/content/buffer.js | 1 -
 common/content/events.js | 6 +-----
 common/content/tabs.js   | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index 79dc31ec..478d0571 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -44,7 +44,6 @@ function Buffer() //{{{
 
     // FIXME: This doesn't belong here.
     let mainWindowID = config.mainWindowID || "main-window";
-
     let fontSize = util.computedStyle(document.getElementById(mainWindowID)).fontSize;
 
     styles.registerSheet("chrome://liberator/skin/liberator.css");
diff --git a/common/content/events.js b/common/content/events.js
index a50bfec4..341adcc3 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -687,7 +687,7 @@ function Events() //{{{
         ["<Tab>"], "Advance keyboard focus",
         function () { document.commandDispatcher.advanceFocus(); });
 
-    mappings.add([modes.NORMAL, modes.PLAYER,modes.VISUAL, modes.CARET, modes.INSERT, modes.TEXTAREA],
+    mappings.add([modes.NORMAL, modes.PLAYER, modes.VISUAL, modes.CARET, modes.INSERT, modes.TEXTAREA],
         ["<S-Tab>"], "Rewind keyboard focus",
         function () { document.commandDispatcher.rewindFocus(); });
 
@@ -1242,13 +1242,9 @@ function Events() //{{{
                 {
                     // Switch to -- PLAYER -- mode for Songbird Media Player.
                     if (config.isPlayerWindow)
-                    {
                         liberator.mode = modes.PLAYER;
-                    }
                     else
-                    {
                         liberator.mode =  modes.NORMAL;
-                    }
                     return;
                 }
 
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 81d71fff..c3cfbd10 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -49,7 +49,7 @@ function Tabs() //{{{
                     tabmail.__defineGetter__("mTabs", function () this.tabContainer.childNodes);
                     tabmail.__defineGetter__("mCurrentTab", function () this.tabContainer.selectedItem);
                     tabmail.__defineGetter__("mStrip", function () this.tabStrip);
-                    tabmail.__defineGetter__("browsers", function () [browser for (browser in Iterator(this.mTabs))] );
+                    tabmail.__defineGetter__("browsers", function () [browser for (browser in Iterator(this.mTabs))]);
                 }
                 return tabmail;
             };
@@ -151,7 +151,7 @@ function Tabs() //{{{
             validator: Option.validateCompleter
         });
 
-    if (config.name == "Vimperator" || config.name == "Xulmus" )
+    if (config.name == "Vimperator" || config.name == "Xulmus")
     {
         options.add(["activate", "act"],
             "Define when tabs are automatically activated",

From 0e28714ce66bd5c0f2989e23e2273b5d97eac5e4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 21:05:38 +1100
Subject: [PATCH 128/143] Revert some of PT's local changes to the build
 system.

---
 common/Makefile.common | 4 ++--
 common/make_jar.sh     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/Makefile.common b/common/Makefile.common
index 89cb8d69..c1458a87 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -9,7 +9,7 @@ LOCALEDIR     = locale
 DOC_SRC_FILES = $(wildcard $(LOCALEDIR)/*/*.txt)
 LOCALES       = $(foreach locale,$(wildcard $(LOCALEDIR)/*),$(word 2,$(subst /, ,$(locale))))
 
-MAKE_JAR      = VERSION="$(VERSION)" DATE="$(BUILD_DATE)" bash  $(BASE)/make_jar.sh
+MAKE_JAR      = VERSION="$(VERSION)" DATE="$(BUILD_DATE)" sh $(BASE)/make_jar.sh
 
 # TODO: specify source files manually?
 JAR_BASES     = $(TOP) $(BASE)
@@ -45,7 +45,7 @@ TARGETS = all help info doc jar xpi install clean distclean $(JAR)
 $(TARGETS:%=\%.%):
 	echo MAKE $* $(@:$*.%=%)
 	$(MAKE) -C $* $(@:$*.%=%)
-	echo $$SHELL
+
 .PHONY: $(TARGETS)
 all: help
 
diff --git a/common/make_jar.sh b/common/make_jar.sh
index 00064e23..7632d64d 100644
--- a/common/make_jar.sh
+++ b/common/make_jar.sh
@@ -51,8 +51,6 @@ do
     )
 done
 
-cd $stage
-zip -r "$top/$jar" *
-cd -
+(cd $stage; zip -r "$top/$jar" *)
 rm -rf "$stage"
 

From a9750cc3fff9c49253a3a5b22f20d142fc018a69 Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Sun, 29 Mar 2009 13:26:55 +0300
Subject: [PATCH 129/143] Remove the executable bit from xulmus files

---
 xulmus/Makefile                        |   0
 xulmus/NEWS                            |   0
 xulmus/chrome.manifest                 |   0
 xulmus/components/chrome-data.js       |   0
 xulmus/content/bookmarks.js            |   0
 xulmus/content/config.js               |   0
 xulmus/content/liberator.dtd           |   0
 xulmus/content/player.js               |   0
 xulmus/content/xulmus.png              | Bin
 xulmus/content/xulmus.svg              |   0
 xulmus/content/xulmus.xul              |   0
 xulmus/contrib/vim/Makefile            |   0
 xulmus/contrib/vim/ftdetect/xulmus.vim |   0
 xulmus/contrib/vim/mkvimball.txt       |   0
 xulmus/contrib/vim/syntax/xulmus.vim   |   0
 xulmus/install.rdf                     |   0
 xulmus/locale/en-US/Makefile           |   0
 xulmus/locale/en-US/asciidoc.conf      |   0
 xulmus/locale/en-US/autocommands.txt   |   0
 xulmus/locale/en-US/browsing.txt       |   0
 xulmus/locale/en-US/buffer.txt         |   0
 xulmus/locale/en-US/cmdline.txt        |   0
 xulmus/locale/en-US/developer.txt      |   0
 xulmus/locale/en-US/eval.txt           |   0
 xulmus/locale/en-US/gui.txt            |   0
 xulmus/locale/en-US/help.js            |   0
 xulmus/locale/en-US/hints.txt          |   0
 xulmus/locale/en-US/index.txt          |   0
 xulmus/locale/en-US/insert.txt         |   0
 xulmus/locale/en-US/intro.txt          |   0
 xulmus/locale/en-US/map.txt            |   0
 xulmus/locale/en-US/marks.txt          |   0
 xulmus/locale/en-US/message.txt        |   0
 xulmus/locale/en-US/options.txt        |   0
 xulmus/locale/en-US/overlay.dtd        |   0
 xulmus/locale/en-US/overlay.properties |   0
 xulmus/locale/en-US/pattern.txt        |   0
 xulmus/locale/en-US/print.txt          |   0
 xulmus/locale/en-US/repeat.txt         |   0
 xulmus/locale/en-US/starting.txt       |   0
 xulmus/locale/en-US/styling.txt        |   0
 xulmus/locale/en-US/tabs.txt           |   0
 xulmus/locale/en-US/tutorial.txt       |   0
 xulmus/locale/en-US/various.txt        |   0
 xulmus/locale/en-US/xhtml11.css        |   0
 xulmus/skin/icon.png                   | Bin
 xulmus/xulmusrc.example                |   0
 47 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 xulmus/Makefile
 mode change 100755 => 100644 xulmus/NEWS
 mode change 100755 => 100644 xulmus/chrome.manifest
 mode change 100755 => 100644 xulmus/components/chrome-data.js
 mode change 100755 => 100644 xulmus/content/bookmarks.js
 mode change 100755 => 100644 xulmus/content/config.js
 mode change 100755 => 100644 xulmus/content/liberator.dtd
 mode change 100755 => 100644 xulmus/content/player.js
 mode change 100755 => 100644 xulmus/content/xulmus.png
 mode change 100755 => 100644 xulmus/content/xulmus.svg
 mode change 100755 => 100644 xulmus/content/xulmus.xul
 mode change 100755 => 100644 xulmus/contrib/vim/Makefile
 mode change 100755 => 100644 xulmus/contrib/vim/ftdetect/xulmus.vim
 mode change 100755 => 100644 xulmus/contrib/vim/mkvimball.txt
 mode change 100755 => 100644 xulmus/contrib/vim/syntax/xulmus.vim
 mode change 100755 => 100644 xulmus/install.rdf
 mode change 100755 => 100644 xulmus/locale/en-US/Makefile
 mode change 100755 => 100644 xulmus/locale/en-US/asciidoc.conf
 mode change 100755 => 100644 xulmus/locale/en-US/autocommands.txt
 mode change 100755 => 100644 xulmus/locale/en-US/browsing.txt
 mode change 100755 => 100644 xulmus/locale/en-US/buffer.txt
 mode change 100755 => 100644 xulmus/locale/en-US/cmdline.txt
 mode change 100755 => 100644 xulmus/locale/en-US/developer.txt
 mode change 100755 => 100644 xulmus/locale/en-US/eval.txt
 mode change 100755 => 100644 xulmus/locale/en-US/gui.txt
 mode change 100755 => 100644 xulmus/locale/en-US/help.js
 mode change 100755 => 100644 xulmus/locale/en-US/hints.txt
 mode change 100755 => 100644 xulmus/locale/en-US/index.txt
 mode change 100755 => 100644 xulmus/locale/en-US/insert.txt
 mode change 100755 => 100644 xulmus/locale/en-US/intro.txt
 mode change 100755 => 100644 xulmus/locale/en-US/map.txt
 mode change 100755 => 100644 xulmus/locale/en-US/marks.txt
 mode change 100755 => 100644 xulmus/locale/en-US/message.txt
 mode change 100755 => 100644 xulmus/locale/en-US/options.txt
 mode change 100755 => 100644 xulmus/locale/en-US/overlay.dtd
 mode change 100755 => 100644 xulmus/locale/en-US/overlay.properties
 mode change 100755 => 100644 xulmus/locale/en-US/pattern.txt
 mode change 100755 => 100644 xulmus/locale/en-US/print.txt
 mode change 100755 => 100644 xulmus/locale/en-US/repeat.txt
 mode change 100755 => 100644 xulmus/locale/en-US/starting.txt
 mode change 100755 => 100644 xulmus/locale/en-US/styling.txt
 mode change 100755 => 100644 xulmus/locale/en-US/tabs.txt
 mode change 100755 => 100644 xulmus/locale/en-US/tutorial.txt
 mode change 100755 => 100644 xulmus/locale/en-US/various.txt
 mode change 100755 => 100644 xulmus/locale/en-US/xhtml11.css
 mode change 100755 => 100644 xulmus/skin/icon.png
 mode change 100755 => 100644 xulmus/xulmusrc.example

diff --git a/xulmus/Makefile b/xulmus/Makefile
old mode 100755
new mode 100644
diff --git a/xulmus/NEWS b/xulmus/NEWS
old mode 100755
new mode 100644
diff --git a/xulmus/chrome.manifest b/xulmus/chrome.manifest
old mode 100755
new mode 100644
diff --git a/xulmus/components/chrome-data.js b/xulmus/components/chrome-data.js
old mode 100755
new mode 100644
diff --git a/xulmus/content/bookmarks.js b/xulmus/content/bookmarks.js
old mode 100755
new mode 100644
diff --git a/xulmus/content/config.js b/xulmus/content/config.js
old mode 100755
new mode 100644
diff --git a/xulmus/content/liberator.dtd b/xulmus/content/liberator.dtd
old mode 100755
new mode 100644
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
old mode 100755
new mode 100644
diff --git a/xulmus/content/xulmus.png b/xulmus/content/xulmus.png
old mode 100755
new mode 100644
diff --git a/xulmus/content/xulmus.svg b/xulmus/content/xulmus.svg
old mode 100755
new mode 100644
diff --git a/xulmus/content/xulmus.xul b/xulmus/content/xulmus.xul
old mode 100755
new mode 100644
diff --git a/xulmus/contrib/vim/Makefile b/xulmus/contrib/vim/Makefile
old mode 100755
new mode 100644
diff --git a/xulmus/contrib/vim/ftdetect/xulmus.vim b/xulmus/contrib/vim/ftdetect/xulmus.vim
old mode 100755
new mode 100644
diff --git a/xulmus/contrib/vim/mkvimball.txt b/xulmus/contrib/vim/mkvimball.txt
old mode 100755
new mode 100644
diff --git a/xulmus/contrib/vim/syntax/xulmus.vim b/xulmus/contrib/vim/syntax/xulmus.vim
old mode 100755
new mode 100644
diff --git a/xulmus/install.rdf b/xulmus/install.rdf
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/Makefile b/xulmus/locale/en-US/Makefile
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/asciidoc.conf b/xulmus/locale/en-US/asciidoc.conf
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/autocommands.txt b/xulmus/locale/en-US/autocommands.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/browsing.txt b/xulmus/locale/en-US/browsing.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/buffer.txt b/xulmus/locale/en-US/buffer.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/cmdline.txt b/xulmus/locale/en-US/cmdline.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/developer.txt b/xulmus/locale/en-US/developer.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/eval.txt b/xulmus/locale/en-US/eval.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/gui.txt b/xulmus/locale/en-US/gui.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/help.js b/xulmus/locale/en-US/help.js
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/hints.txt b/xulmus/locale/en-US/hints.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/insert.txt b/xulmus/locale/en-US/insert.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/intro.txt b/xulmus/locale/en-US/intro.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/map.txt b/xulmus/locale/en-US/map.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/marks.txt b/xulmus/locale/en-US/marks.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/message.txt b/xulmus/locale/en-US/message.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/overlay.dtd b/xulmus/locale/en-US/overlay.dtd
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/overlay.properties b/xulmus/locale/en-US/overlay.properties
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/pattern.txt b/xulmus/locale/en-US/pattern.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/print.txt b/xulmus/locale/en-US/print.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/repeat.txt b/xulmus/locale/en-US/repeat.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/starting.txt b/xulmus/locale/en-US/starting.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/styling.txt b/xulmus/locale/en-US/styling.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/tabs.txt b/xulmus/locale/en-US/tabs.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/tutorial.txt b/xulmus/locale/en-US/tutorial.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/various.txt b/xulmus/locale/en-US/various.txt
old mode 100755
new mode 100644
diff --git a/xulmus/locale/en-US/xhtml11.css b/xulmus/locale/en-US/xhtml11.css
old mode 100755
new mode 100644
diff --git a/xulmus/skin/icon.png b/xulmus/skin/icon.png
old mode 100755
new mode 100644
diff --git a/xulmus/xulmusrc.example b/xulmus/xulmusrc.example
old mode 100755
new mode 100644

From 626f585db69c185c1cf0ae976abdd42a14483957 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 21:28:47 +1100
Subject: [PATCH 130/143] Update MS's email address.

---
 License.txt                       | 2 +-
 xulmus/AUTHORS                    | 2 +-
 xulmus/content/bookmarks.js       | 2 +-
 xulmus/content/config.js          | 2 +-
 xulmus/locale/en-US/asciidoc.conf | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/License.txt b/License.txt
index 3c775c7f..022fe23b 100644
--- a/License.txt
+++ b/License.txt
@@ -10,7 +10,7 @@ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 for the specific language governing rights and limitations under the
 License.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 Copyright (c) 2009 by Prathyush Thota <prathyushthota@gmail.com>
 
 Alternatively, the contents of this file may be used under the terms of
diff --git a/xulmus/AUTHORS b/xulmus/AUTHORS
index 8ad48f24..4c5be983 100644
--- a/xulmus/AUTHORS
+++ b/xulmus/AUTHORS
@@ -2,5 +2,5 @@ Main developer/Project founder:
   * Prathyush Thota <prathyushthota@gmail.com>
 
 Developers:
-  * Martin Stubenschrott (stubenschrott@gmx.net)
+  * Martin Stubenschrott (stubenschrott@vimperator.org)
   * Doug Kearns (dougkearns@gmail.com)
diff --git a/xulmus/content/bookmarks.js b/xulmus/content/bookmarks.js
index 9f73121f..dfe2b127 100644
--- a/xulmus/content/bookmarks.js
+++ b/xulmus/content/bookmarks.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 8d4b2134..1e8185d8 100644
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -11,7 +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.
 
-Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@gmx.net>
+Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
 
 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
diff --git a/xulmus/locale/en-US/asciidoc.conf b/xulmus/locale/en-US/asciidoc.conf
index 4187121a..abfab80f 100644
--- a/xulmus/locale/en-US/asciidoc.conf
+++ b/xulmus/locale/en-US/asciidoc.conf
@@ -2,7 +2,7 @@
 
 [glossary]
 author=Martin Stubenschrott
-email=stubenschrott@gmx.net
+email=stubenschrott@vimperator.org
 
 [header]
 <?xml version="1.0" encoding="UTF-8"?>

From 8c76a2ec6591a179dc97d718c239d5971c0bc86c Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Sun, 29 Mar 2009 13:35:39 +0300
Subject: [PATCH 131/143] Copyright Martin and the people in AUTHORS

---
 License.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/License.txt b/License.txt
index 022fe23b..415f9f5d 100644
--- a/License.txt
+++ b/License.txt
@@ -11,7 +11,7 @@ for the specific language governing rights and limitations under the
 License.
 
 Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
-Copyright (c) 2009 by Prathyush Thota <prathyushthota@gmail.com>
+and the authors of the specific projects inside (see the AUTHORS file in each).
 
 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

From 7ad4abf333c71fb64497c8f9169f0f4c7ac764ed Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 21:50:15 +1100
Subject: [PATCH 132/143] Remove some merged debugging code from loadModule.

Unintentionally merged from the xulmus branch.
---
 common/content/liberator.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 4631ce82..a10f9300 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -83,9 +83,6 @@ const liberator = (function () //{{{
         {
             if (nError++ == 0)
                 window.toJavaScriptConsole();
-            liberator.dump("Error loading module - "+ name + "..");
-            liberator.dump(e);
-            liberator.dump(e.stack);
             liberator.reportError(e);
         }
     }

From 3ff4fda7cab8fa2eb2e904896e2655efd7e47429 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 23:49:18 +1100
Subject: [PATCH 133/143] Remove :winclose and :winopen commmands from Xulmus.

These are generally unsupported in SB and probably not worth supporting
in Xulmus.
---
 xulmus/content/config.js         | 21 ---------------------
 xulmus/locale/en-US/browsing.txt | 14 --------------
 xulmus/locale/en-US/index.txt    |  2 --
 3 files changed, 37 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 1e8185d8..55a4e0f2 100644
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -464,27 +464,6 @@ const config = { //{{{
                 literal: 0
             });
 
-        commands.add(["winc[lose]", "wc[lose]"],
-            "Close window",
-            function () { window.close(); },
-            { argCount: "0" });
-
-        commands.add(["wino[pen]", "wo[pen]", "wine[dit]"],
-            "Open one or more URLs in a new window",
-            function (args)
-            {
-                args = args.string;
-
-                if (args)
-                    liberator.open(args, liberator.NEW_WINDOW);
-                else
-                    liberator.open("about:blank", liberator.NEW_WINDOW);
-            },
-            {
-                completer: function (context) completion.url(context),
-                literal: 0
-            });
-
         /////////////////////////////////////////////////////////////////////////////}}}
         ////////////////////// OPTIONS /////////////////////////////////////////////////
         /////////////////////////////////////////////////////////////////////////////{{{
diff --git a/xulmus/locale/en-US/browsing.txt b/xulmus/locale/en-US/browsing.txt
index ddbe2add..ab3df4b6 100644
--- a/xulmus/locale/en-US/browsing.txt
+++ b/xulmus/locale/en-US/browsing.txt
@@ -100,13 +100,6 @@ like [m]o[m] but preselects current URL in the [c]:open[c] query.
 ________________________________________________________________________________
 
 
-|:winopen| |:wopen| |:winedit|
-||:wino[pen][!] [a][arg1][a], [a][arg2][a], ...|| +
-________________________________________________________________________________
-Just like [c]:tabopen[c] but opens the resulting web page(s) in a new window.
-________________________________________________________________________________
-
-
 |<MiddleMouse>| |p| +
 ||p||
 ________________________________________________________________________________
@@ -299,13 +292,6 @@ The session is not stored.
 ________________________________________________________________________________
 
 
-|:wc| |:wclose| |:winc| |:winclose|
-||:winc[lose]|| +
-________________________________________________________________________________
-Close window.
-________________________________________________________________________________
-
-
 |:xa| |:xall| |:wq| |:wqa| |:wqall|
 ||:wqa[ll]|| +
 ||:xa[ll]||
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index bb8510bc..b6380322 100644
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -296,8 +296,6 @@ section:Ex{nbsp}commands[ex-cmd-index,:index]
 ||[c]:version[c]|| Show version information +
 ||[c]:viewsource[c]|| View source code of current document +
 ||[c]:viusage[c]|| List all mappings with a short description +
-||[c]:winclose[c]|| Close window +
-||[c]:winopen[c]|| Open one or more URLs in a new window +
 ||[c]:wqall[c]|| Save the session and quit +
 ||[c]:zoom[c]|| Set zoom value of current web page +
 

From 24216eb7a42f3e3ad8d4956a8030db51c3ee935e Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 29 Mar 2009 23:52:27 +1100
Subject: [PATCH 134/143] Add "w" and "W" mappings to the help index.

---
 vimperator/locale/en-US/index.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt
index 1d2759a0..973b509a 100644
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -50,6 +50,7 @@ section:Normal{nbsp}mode[normal-index]
 ||[m]R[m]|| Reload while skipping the cache +
 ||[m]T[m]|| Open one or more URLs in a new tab, based on current location +
 ||[m]Y[m]|| Copy selected text or current word +
+||[m]W[m]|| Open one or more URLs in a new window, based on current location +
 
 ||[m]a[m]|| Open a prompt to bookmark the current URL +
 ||[m]b[m]|| Open a prompt to switch buffers +
@@ -69,6 +70,7 @@ section:Normal{nbsp}mode[normal-index]
 ||[m]t[m]|| Open one or more URLs in a new tab +
 ||[m]u[m]|| Undo closing of a tab +
 ||[m]y[m]|| Yank current location to the clipboard +
+||[m]w[m]|| Open one or more URLs in a new window +
 
 ||[m];[m]|| Start an extended hint mode +
 

From 2d25c1f7c3edc14df30c355b28b58825c14515d9 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 30 Mar 2009 00:32:11 +1100
Subject: [PATCH 135/143] Add <S-Left>/<S-Right> (like H/L) mappings to Player
 mode.

Also the appropriate prefix to Player mode help tags.
---
 xulmus/content/player.js       | 13 ++++-------
 xulmus/locale/en-US/index.txt  |  5 +++-
 xulmus/locale/en-US/player.txt | 42 +++++++++++++++++-----------------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 52656a4c..909284c7 100644
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -1,5 +1,3 @@
-// Import Artist List as this can be huge
-
 function Player() // {{{
 {
     ////////////////////////////////////////////////////////////////////////////////
@@ -52,13 +50,12 @@ function Player() // {{{
     }
 
     // Get the artist names before hand.
-
     let artists = getArtistsArray();
 
     const pageService = Components.classes["@songbirdnest.com/Songbird/MediaPageManager;1"]
                                   .getService(Components.interfaces.sbIMediaPageManager);
-    // Register Callbacks for searching.
 
+    // Register Callbacks for searching.
     liberator.registerCallback("change", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
     liberator.registerCallback("submit", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
     //liberator.registerCallback("cancel", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
@@ -175,12 +172,12 @@ function Player() // {{{
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
-        ["H"], "Seek -1m",
+        ["H", "<S-Left>"], "Seek -1m",
         function (count) { player.seekBackward(Math.max(1, count) * 60000); },
         { flags: Mappings.flags.COUNT });
 
     mappings.add([modes.PLAYER],
-        ["L"], "Seek +1m",
+        ["L", "<S-Right>"], "Seek +1m",
         function (count) { player.seekForward(Math.max(1, count) * 60000); },
         { flags: Mappings.flags.COUNT });
 
@@ -217,7 +214,7 @@ function Player() // {{{
     ////////////////////// COMMANDS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // TODO: presumably this will eventually just filter the library view like cmus? --djk
+    // TODO: rename :Filter to :filter and move this functionality into :tqueue etc? --djk
     commands.add(["f[ilter]"],
         "Filter and play tracks",
         function (args)
@@ -591,7 +588,7 @@ function Player() // {{{
             }
             else
             {
-                liberator.echoerr("E486 Pattern not found: "+searchString, commandline.FORCE_SINGLELINE);
+                liberator.echoerr("E486 Pattern not found: " + searchString, commandline.FORCE_SINGLELINE);
             }
         },
 
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index b6380322..4f5e37f0 100644
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -17,14 +17,17 @@ section:Player{nbsp}mode[player-index]
 ||[m]f[m]|| Filter and play tracks +
 ||[m]F[m]|| Filter and show the tracks as a view +
 ||[m]h[m]|| Seek -10s +
+||[m]<Left>[m]|| Seek -10s +
 ||[m]l[m]|| Seek +10s +
+||[m]<Right>[m]|| Seek -10s +
 ||[m]H[m]|| Seek -1m +
+||[m]<S-Left>[m]|| Seek -10s +
 ||[m]L[m]|| Seek +1m +
+||[m]<S-Right>[m]|| Seek -10s +
 ||[m]+[m]|| Increase volume by 10% +
 ||[m]-[m]|| Decrease volume by 10% +
 
 ||[m]/[m]|| Search forward for a track +
-//||[m]?[m]|| Search backward for a track +
 ||[m]n[m]|| Find the next track +
 ||[m]N[m]|| Find the previous track +
 
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index ab9d5a0f..08324382 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -7,14 +7,14 @@ tab has focus.
 
 section:Playing{nbsp}tracks[playing-tracks]
 
-|x| |:playerp| |:playerplay|
+|p_x| |:playerp| |:playerplay|
 ||:playerp[lay]|| +
 ||x||
 ________________________________________________________________________________
 Play the current track.
 ________________________________________________________________________________
 
-|z| |:playerpr| |:playerprev|
+|p_z| |:playerpr| |:playerprev|
 ||:playerpr[ev]|| +
 ||z||
 ________________________________________________________________________________
@@ -22,7 +22,7 @@ Play the previous track.
 ________________________________________________________________________________
 
 
-|b| |:playern| |:playernext|
+|p_b| |:playern| |:playernext|
 ||:playern[ext]|| +
 ||b||
 ________________________________________________________________________________
@@ -30,7 +30,7 @@ Play the next track.
 ________________________________________________________________________________
 
 
-|c| |:playerpa| |:playerpause|
+|p_c| |:playerpa| |:playerpause|
 ||:playerpa[use]|| +
 ||c||
 ________________________________________________________________________________
@@ -38,7 +38,7 @@ Pause/unpause the current track.
 ________________________________________________________________________________
 
 
-|v| |:players| |:playerstop|
+|p_v| |:players| |:playerstop|
 ||:players[top]|| +
 ||v||
 ________________________________________________________________________________
@@ -46,21 +46,21 @@ Stop playing the current track.
 ________________________________________________________________________________
 
 
-|x|
+|p_x|
 ||x||
 ________________________________________________________________________________
 Toggle shuffle mode.
 ________________________________________________________________________________
 
 
-|r|
+|p_r|
 ||r||
 ________________________________________________________________________________
 Toggle repeat mode.
 ________________________________________________________________________________
 
 
-|i|
+|p_i|
 ||i||
 ________________________________________________________________________________
 Select the currently playing track.
@@ -68,7 +68,7 @@ ________________________________________________________________________________
 
 section:Filtering{nbsp}the{nbsp}library[filter,filtering]
 
-|f| |:f| |:filter|
+|p_f| |:f| |:filter|
 ||:f[ilter] {artist} [a][album][a] [a][track][a]|| +
 ||f||
 ________________________________________________________________________________
@@ -79,7 +79,7 @@ tracks for that album are played. A specific track can be specified with
 ________________________________________________________________________________
 
 
-|F| |:F| |:Filter|
+|p_F| |:F| |:Filter|
 ||:F[ilter] {keywords}|| +
 ||F||
 ________________________________________________________________________________
@@ -90,28 +90,28 @@ ________________________________________________________________________________
 
 section:Seeking{nbsp}to{nbsp}a{nbsp}track{nbsp}position[seeking]
 
-|<Left>| |h|
+|p_<Left>| |p_h|
 ||[count]h||
 ________________________________________________________________________________
 Seek +10s.
 ________________________________________________________________________________
 
 
-|<Right>| |l|
+|p_<Right>| |p_l|
 ||[count]l||
 ________________________________________________________________________________
 Seek -10s.
 ________________________________________________________________________________
 
 
-|H|
+|p_<S-Left>| |p_H|
 ||[count]H||
 ________________________________________________________________________________
 Seek +1m.
 ________________________________________________________________________________
 
 
-|L|
+|p_<S-Right>| |p_L|
 ||[count]L||
 ________________________________________________________________________________
 Seek -1m.
@@ -132,7 +132,7 @@ ________________________________________________________________________________
 
 section:Adjusting{nbsp}the{nbsp}volume[volume]
 
-|+| |=|
+|p_+| |p_=|
 ||+|| +
 ||=||
 ________________________________________________________________________________
@@ -140,7 +140,7 @@ Increase volume by 10%.
 ________________________________________________________________________________
 
 
-|-|
+|p_-|
 ||-|| +
 ________________________________________________________________________________
 Decrease volume by 10%.
@@ -175,26 +175,26 @@ ________________________________________________________________________________
 
 section:Search{nbsp}commands[search]
 
-|/|
+|p_/|
 ||/{pattern}<CR>|| +
 ________________________________________________________________________________
 Search forward for a track matching {pattern} in the visible media view.
 ________________________________________________________________________________
 
-//|?|
+//|p_?|
 //||?{pattern}<CR>|| +
 //________________________________________________________________________________
 //Search backwards for a track matching {pattern} in the visible media view.
 //________________________________________________________________________________
 
-|n|
+|p_n|
 ||n|| +
 ________________________________________________________________________________
 Find the next track. Repeats the last search. If the search hits BOTTOM of the
 view, it continues from TOP.
 ________________________________________________________________________________
 
-|N|
+|p_N|
 ||N|| +
 ________________________________________________________________________________
 Find the previous track. Repeats the last search in the opposite direction. If
@@ -203,7 +203,7 @@ ________________________________________________________________________________
 
 section:Rating{nbsp}tracks[rating]
 
-|<C-5>| |<C-4>| |<C-3>| |<C-2>| |<C-1>| |<C-0>|
+|p_<C-5>| |p_<C-4>| |p_<C-3>| |p_<C-2>| |p_<C-1>| |p_<C-0>|
 ||<C-0>|| +
 ||<C-1>|| +
 ||<C-2>|| +

From 8300db58dcaedee2e73a03c55f1f35f384982a3d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 30 Mar 2009 01:03:22 +1100
Subject: [PATCH 136/143] Respect 'incsearch' when searching in Player mode.

---
 xulmus/TODO              |  2 +-
 xulmus/content/player.js | 30 +++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/xulmus/TODO b/xulmus/TODO
index 9a5e1dcf..b9399a58 100644
--- a/xulmus/TODO
+++ b/xulmus/TODO
@@ -10,12 +10,12 @@ BUGS:
     Is this workable anyway? --djk
   - <C-^> is off by one when alternating with the media tab
   - numbered tabs
-  - :winopen
 
 FEATURES:
 9 '?' - Reusing '/'. 
 8 Playlist/SmartPlaylist operations & meta-data operations.
 7 extended hint mode for opening links in FF.
+6 :tqueue, :lqueue etc.
 5 make Player mode commands work in the Mini-Player.
 5 Check for default extensions and add commands for them. Ex. Last.fm, Seeqpod e.t.c
     Wouldn't these be provided as Xulmus plugins like Vimperator does? --djk
diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 909284c7..54d5eaf7 100644
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -56,8 +56,8 @@ function Player() // {{{
                                   .getService(Components.interfaces.sbIMediaPageManager);
 
     // Register Callbacks for searching.
-    liberator.registerCallback("change", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
-    liberator.registerCallback("submit", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
+    liberator.registerCallback("change", modes.SEARCH_VIEW_FORWARD, function (str) { player.onSearchKeyPress(str); });
+    liberator.registerCallback("submit", modes.SEARCH_VIEW_FORWARD, function (str) { player.onSearchSubmit(str); });
     //liberator.registerCallback("cancel", modes.SEARCH_VIEW_FORWARD, function (command) { player.searchView(command);});
 
     // interval (milliseconds)
@@ -592,16 +592,22 @@ function Player() // {{{
             }
         },
 
-        //FIXME: commandline.echo should work --ken
         searchViewAgain: function searchViewAgain(reverse)
         {
+            function echo(str)
+            {
+                setTimeout(function () {
+                    commandline.echo("Search hit TOP, continuing at BOTTOM",
+                          commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
+                }, 0);
+            }
+
             if (reverse)
             {
                 if (lastSearchIndex == 0)
                 {
-                    //commandline.echo("Search hit TOP, continuing at BOTTOM",
-                    //      commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
                     lastSearchIndex = lastSearchView.length - 1;
+                    echo("Search hit TOP, continuing at BOTTOM");
                 }
                 else
                     lastSearchIndex = lastSearchIndex - 1;
@@ -610,9 +616,8 @@ function Player() // {{{
             {
                 if (lastSearchIndex == (lastSearchView.length - 1))
                 {
-                    //commandline.echo("Search hit BOTTOM, continuing at TOP",
-                    //      commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
                     lastSearchIndex = 0;
+                    echo("Search hit BOTTOM, continuing at TOP");
                 }
                 else
                     lastSearchIndex = lastSearchIndex + 1;
@@ -624,6 +629,17 @@ function Player() // {{{
 
         },
 
+        onSearchKeyPress: function (str)
+        {
+            if (options["incsearch"])
+                this.searchView(str);
+        },
+
+        onSearchSubmit: function (str)
+        {
+            this.searchView(str);
+        },
+
         getPlaylists: function getPlaylists()
         {
             let mainLibrary = LibraryUtils.mainLibrary;

From ec04c9b23a27a46fa1caf4b7124c8fad88739bdc Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 30 Mar 2009 01:42:12 +1100
Subject: [PATCH 137/143] Make the "track" keyword available to Stream*
 autocommands.

---
 xulmus/content/player.js             | 16 ++++++++--------
 xulmus/locale/en-US/autocommands.txt |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index 54d5eaf7..ddcef4d8 100644
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -93,20 +93,20 @@ function Player() // {{{
                     autocommands.trigger("ViewChange", { view: event.data });
                     break;
                 case Ci.sbIMediacoreEvent.STREAM_START:
-                    liberator.log("Track started: " + event.data);
-                    autocommands.trigger("StreamStart", {});
+                    liberator.log("Track started: " + gMM.sequencer.currentItem);
+                    autocommands.trigger("StreamStart", { track: gMM.sequencer.currentItem });
                     break;
                 case Ci.sbIMediacoreEvent.STREAM_PAUSE:
-                    liberator.log("Track paused: " + event.data);
-                    autocommands.trigger("StreamPause", {});
+                    liberator.log("Track paused: " + gMM.sequencer.currentItem);
+                    autocommands.trigger("StreamPause", { track: gMM.sequencer.currentItem });
                     break;
                 case Ci.sbIMediacoreEvent.STREAM_END:
-                    liberator.log("Track ended: " + event.data);
-                    autocommands.trigger("StreamEnd", {});
+                    liberator.log("Track ended: " + gMM.sequencer.currentItem);
+                    autocommands.trigger("StreamEnd", { track: gMM.sequencer.currentItem });
                     break;
                 case Ci.sbIMediacoreEvent.STREAM_STOP:
-                    liberator.log("Track stopped: " + event.data);
-                    autocommands.trigger("StreamStop", {});
+                    liberator.log("Track stopped: " + gMM.sequencer.currentItem);
+                    autocommands.trigger("StreamStop", { track: gMM.sequencer.currentItem });
                     break;
             }
         }
diff --git a/xulmus/locale/en-US/autocommands.txt b/xulmus/locale/en-US/autocommands.txt
index c2af4a9a..c59e18ba 100644
--- a/xulmus/locale/en-US/autocommands.txt
+++ b/xulmus/locale/en-US/autocommands.txt
@@ -62,7 +62,7 @@ The following keywords are available where relevant:
 *<state>*      The new fullscreen state. Only for *Fullscreen*.
 *<name>*       The color scheme name. Only for *ColorScheme*.
 *<view>*       The new sequencer view. Only for *ViewChangePre* and *ViewChange*.
-*<track>*      The new media track. Only for *TrackChangePre* and *TrackChange*.
+*<track>*      The new media track. Only for *TrackChangePre*, *TrackChange* and *Stream\**.
 --------------------------------------------------------------
 
 ________________________________________________________________________________

From 13654d28a70768e171e1aa2bdaaa43c8ccf7a1d8 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@vimperator.org>
Date: Sun, 29 Mar 2009 22:59:18 +0200
Subject: [PATCH 138/143] Add vimperator labs artwork

---
 www/vimperator_labs_background.jpg          | Bin 0 -> 69394 bytes
 www/vimperator_labs_background_original.jpg | Bin 0 -> 108834 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 www/vimperator_labs_background.jpg
 create mode 100644 www/vimperator_labs_background_original.jpg

diff --git a/www/vimperator_labs_background.jpg b/www/vimperator_labs_background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0c9b8b10c6d59593bd1382a13b7a2b46257443f8
GIT binary patch
literal 69394
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

literal 0
HcmV?d00001

diff --git a/www/vimperator_labs_background_original.jpg b/www/vimperator_labs_background_original.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ffbcf38f4dbab18b19a0292045ea083b4ba398d3
GIT binary patch
literal 108834
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
C0|WU0

literal 0
HcmV?d00001


From 187a53c4cae837585dd4254329e81db0b65308dc Mon Sep 17 00:00:00 2001
From: Daniel Bainton <dpb@driftaway.org>
Date: Mon, 30 Mar 2009 01:39:10 +0300
Subject: [PATCH 139/143] add 'maxitems' option (Jarkko Oranen)

---
 common/content/ui.js                | 25 +++++++++++++++----------
 vimperator/AUTHORS                  |  1 +
 vimperator/NEWS                     |  1 +
 vimperator/locale/en-US/options.txt |  6 ++++++
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/common/content/ui.js b/common/content/ui.js
index fc55d93a..583104bd 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -777,6 +777,11 @@ function CommandLine() //{{{
         "number", 500,
         { validator: function (value) value >= 0 });
 
+    options.add(["maxitems"],
+        "Maximum number of items to display at once",
+        "number", 20,
+        { validator: function (value) value >= 0 });
+
     options.add(["messages", "msgs"],
         "Number of messages to store in the message history",
         "number", 100,
@@ -1725,8 +1730,6 @@ function ItemList(id) //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    const CONTEXT_LINES = 3;
-    var maxItems = 20;
     var completionElements = [];
 
     var iframe = document.getElementById(id);
@@ -1782,7 +1785,7 @@ function ItemList(id) //{{{
                 <div key="completions"/>
                 <div highlight="Completions">
                 {
-                    template.map(util.range(0, maxItems * 2), function (i)
+                    template.map(util.range(0, options["maxitems"] * 2), function (i)
                     <span highlight="CompItem">
                         <li highlight="NonText">~</li>
                     </span>)
@@ -1818,7 +1821,7 @@ function ItemList(id) //{{{
      * Uses the entries in "items" to fill the listbox and does incremental
      * filling to speed up things.
      *
-     * @param {number} offset Start at this index and show maxItems.
+     * @param {number} offset Start at this index and show options["maxitems"].
      */
     function fill(offset)
     {
@@ -1828,11 +1831,11 @@ function ItemList(id) //{{{
             return false;
 
         startIndex = offset;
-        endIndex = Math.min(startIndex + maxItems, items.allItems.items.length);
+        endIndex = Math.min(startIndex + options["maxitems"], items.allItems.items.length);
 
         let haveCompletions = false;
         let off = 0;
-        let end = startIndex + maxItems;
+        let end = startIndex + options["maxitems"];
         function getRows(context)
         {
             function fix(n) Math.max(0, Math.min(len, n));
@@ -1946,6 +1949,8 @@ function ItemList(id) //{{{
             let sel = selIndex;
             let len = items.allItems.items.length;
             let newOffset = startIndex;
+            let maxItems = options["maxitems"];
+            let contextLines = (maxItems > 3)? 3 : Math.max(0, maxItems - 1);
 
             if (index == -1 || index == null || index == len) // wrapped around
             {
@@ -1956,10 +1961,10 @@ function ItemList(id) //{{{
             }
             else
             {
-                if (index <= startIndex + CONTEXT_LINES)
-                    newOffset = index - CONTEXT_LINES;
-                if (index >= endIndex - CONTEXT_LINES)
-                    newOffset = index + CONTEXT_LINES - maxItems + 1;
+                if (index <= startIndex + contextLines)
+                    newOffset = index - contextLines;
+                if (index >= endIndex - contextLines)
+                    newOffset = index + contextLines - maxItems + 1;
 
                 newOffset = Math.min(newOffset, len - maxItems);
                 newOffset = Math.max(newOffset, 0);
diff --git a/vimperator/AUTHORS b/vimperator/AUTHORS
index 73e4075d..754dc698 100644
--- a/vimperator/AUTHORS
+++ b/vimperator/AUTHORS
@@ -39,3 +39,4 @@ Patches (in no special order):
   * Ryan Zheng (ctrl-x/a support)
   * Dan Boger (:set online support)
   * Štěpán Němec (help copy-editing and favicon support)
+  * Jarkko Oranen ('maxitems' option)
diff --git a/vimperator/NEWS b/vimperator/NEWS
index b5751b55..5603ff68 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -5,6 +5,7 @@
     * add ' and " local marks
     * add "w" and "W" Normal mode mappings for symmetry with o/O and t/T
     * add :messclear
+    * add 'maxitems' configuration variable
 
 2009-03-28:
     * version 2.0
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index c434cb79..7b4a5295 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -480,6 +480,12 @@ load plugins earlier, use the [c]:loadplugins[c] command within the
 vimperatorrc.
 ____
 
+|\'maxitems'|
+||'maxitems'|| number (default: 20)
+____
+Maximum number of items to display at once in a listing.
+____
+
 
 |\'msgs'| |\'messages'|
 ||'messages' 'msgs'|| number (default: 100)

From 89a3255a45d26339dde354a7f1d8dc681b9fb65e Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@vimperator.org>
Date: Mon, 30 Mar 2009 00:37:35 +0200
Subject: [PATCH 140/143] release muttator 0.5

---
 muttator/Makefile    | 2 +-
 muttator/NEWS        | 4 +++-
 muttator/install.rdf | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/muttator/Makefile b/muttator/Makefile
index 13f19fdc..fc702e36 100644
--- a/muttator/Makefile
+++ b/muttator/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.5pre
+VERSION       = 0.5
 NAME          = muttator
 
 include ../common/Makefile.common
diff --git a/muttator/NEWS b/muttator/NEWS
index 3df6ed64..1a72b793 100644
--- a/muttator/NEWS
+++ b/muttator/NEWS
@@ -1,7 +1,9 @@
-2008-xx-xx:
+2008-03-29
     * version 0.5
+    * fixes for recent TB nightly changes
     * new "threads" option (non-functional for now)
     * new "archivefolder" option
+    * small bug fixes
 
 2008-08-03:
     * version 0.4
diff --git a/muttator/install.rdf b/muttator/install.rdf
index 81010653..26d300e7 100644
--- a/muttator/install.rdf
+++ b/muttator/install.rdf
@@ -19,7 +19,7 @@
 	<em:targetApplication>
 	    <Description>
 		<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-		<em:minVersion>3.0b2pre</em:minVersion>
+		<em:minVersion>3.0b3pre</em:minVersion>
 		<em:maxVersion>3.0b3</em:maxVersion>
 	    </Description>
 	</em:targetApplication>

From 8e288dd82ebc6789388633f372eada947dfeecff Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 30 Mar 2009 12:35:01 +1100
Subject: [PATCH 141/143] Fix comment typo.

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

diff --git a/common/content/find.js b/common/content/find.js
index 89ebcb1f..1599bc00 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -1,4 +1,4 @@
-/***** B/GIN LICENSE BLOCK ***** {{{
+/***** 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

From f162833d93cc31fa9de4dd48015b6a680725132a Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 30 Mar 2009 12:43:35 +1100
Subject: [PATCH 142/143] Add 'maxitems' to the help index.

---
 vimperator/TODO                     | 3 +++
 vimperator/locale/en-US/index.txt   | 1 +
 vimperator/locale/en-US/options.txt | 1 +
 xulmus/locale/en-US/index.txt       | 1 +
 xulmus/locale/en-US/options.txt     | 8 ++++++++
 5 files changed, 14 insertions(+)

diff --git a/vimperator/TODO b/vimperator/TODO
index d6f0d711..f4c626ce 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -1,6 +1,9 @@
 Priority list:
 1-9 as in Vim (9 = required for next release, 5 = would be nice, 1 = probably not)
 
+ARCHITECTURE:
+- modular help system
+
 BUGS:
 - add window resize support to hints
 - searching backwards incrementally does not work i.e. with 'incsearch' set
diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt
index 973b509a..c5cf8efb 100644
--- a/vimperator/locale/en-US/index.txt
+++ b/vimperator/locale/en-US/index.txt
@@ -287,6 +287,7 @@ section:Options[option-index]
 ||'laststatus'|| Show the status line +
 ||'linksearch'|| Limit the search to hyperlink text +
 ||'loadplugins'|| Load plugin scripts when starting up +
+||'maxitems'|| Maximum number of items to display at once in a listing +
 ||'messages'|| Number of messages to store in the message history +
 ||'more'|| Pause the message list window when more than one screen of listings is displayed +
 ||'newtab'|| Define which commands should output in a new tab by default +
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 7b4a5295..f5cd0a5d 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -480,6 +480,7 @@ load plugins earlier, use the [c]:loadplugins[c] command within the
 vimperatorrc.
 ____
 
+
 |\'maxitems'|
 ||'maxitems'|| number (default: 20)
 ____
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index 4f5e37f0..6fa51e1a 100644
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -329,6 +329,7 @@ section:Options[option-index]
 ||'laststatus'|| Show the status line +
 ||'linksearch'|| Limit the search to hyperlink text +
 ||'loadplugins'|| Load plugin scripts when starting up +
+||'maxitems'|| Maximum number of items to display at once in a listing +
 ||'messages'|| Number of messages to store in the message history +
 ||'more'|| Pause the message list window when more than one screen of listings is displayed +
 ||'newtab'|| Define which commands should output in a new tab by default +
diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt
index 9ad5f1de..9bcd2de3 100644
--- a/xulmus/locale/en-US/options.txt
+++ b/xulmus/locale/en-US/options.txt
@@ -477,6 +477,14 @@ xulmusrc.
 ____
 
 
+|\'maxitems'|
+||'maxitems'|| number (default: 20)
+____
+Maximum number of items to display at once in a listing.
+____
+
+
+
 |\'msgs'| |\'messages'|
 ||'messages' 'msgs'|| number (default: 100)
 ____

From 1ae692bd777f6e1fde9e93f17e0b053a946453b3 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Mon, 30 Mar 2009 13:34:19 +1100
Subject: [PATCH 143/143] Fix search scroll limit messages in Player mode.

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

diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index ddcef4d8..e7dc64a0 100644
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -597,8 +597,7 @@ function Player() // {{{
             function echo(str)
             {
                 setTimeout(function () {
-                    commandline.echo("Search hit TOP, continuing at BOTTOM",
-                          commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
+                    commandline.echo(str, commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
                 }, 0);
             }