Rename -liberator command-line option to -[config-name].

4 files changed, 17 insertions, 11 deletions

diff --git a/vimperator/TODO b/vimperator/TODO
index fa4bcf16..c6bb418b 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -5,10 +5,13 @@ ARCHITECTURE:
 - modular help system
 	- I made a quick attempt at parameterizing it using attributes but it
 	  breaks Asciidoc formatting in certain unpredictable (to me at least)
-	  contexts. *sigh* --djk
+	  contexts. --djk
         - move as much as possible to common/*
 - decide on how to document Arrays in our jsdoc(ish) documentation. Is there
   even a documentation tool that can parse our source sensibly?
+- update build system to generate config specific components from templates in
+  common/components/* and copy others -
+  a739cdeab8f1648fd771f17d8a4885533032376f attempt at linking didn't work.
 
 BUGS:
 - add window resize support to hints
diff --git a/vimperator/components/commandline-handler.js b/vimperator/components/commandline-handler.js
index a4d1f2e4..683ed152 100644
--- a/vimperator/components/commandline-handler.js
+++ b/vimperator/components/commandline-handler.js
@@ -7,15 +7,15 @@ function CommandLineHandler()
 
 CommandLineHandler.prototype = {
 
-    classDescription: "Liberator Command-line Handler",
+    classDescription: "Vimperator Command-line Handler",
 
     classID: Components.ID("{16dc34f7-6d22-4aa4-a67f-2921fb5dcb69}"),
 
-    contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=liberator",
+    contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=vimperator",
 
     _xpcom_categories: [{
         category: "command-line-handler",
-        entry: "m-liberator"
+        entry: "m-vimperator"
     }],
 
     QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsICommandLineHandler]),
@@ -25,11 +25,11 @@ CommandLineHandler.prototype = {
         // TODO: handle remote launches differently?
         try
         {
-            this.optionValue = commandLine.handleFlagWithParam("liberator", false);
+            this.optionValue = commandLine.handleFlagWithParam("vimperator", false);
         }
         catch (e)
         {
-            //"liberator: option -liberator requires an argument"
+            //"vimperator: option -vimperator requires an argument"
         }
     }
 };
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index fd75ada3..eece18a9 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -158,6 +158,9 @@ const config = { //{{{
 
     init: function ()
     {
+        services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=vimperator",
+            Ci.nsICommandLineHandler);
+
         // load Vimperator 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
diff --git a/vimperator/locale/en-US/starting.txt b/vimperator/locale/en-US/starting.txt
index 5361bb10..8c9abdb0 100644
--- a/vimperator/locale/en-US/starting.txt
+++ b/vimperator/locale/en-US/starting.txt
@@ -2,12 +2,12 @@ heading::Starting{nbsp}Vimperator[starting]
 
 |startup-options| +
 
-Command-line options can be passed to Vimperator via the -liberator Firefox
+Command-line options can be passed to Vimperator via the -vimperator Firefox
 option. These are passed as single string argument.
-E.g firefox -liberator "$$++cmd='set exrc' +u='tempRcFile' ++noplugin$$"
+E.g firefox -vimperator "$$++cmd 'set exrc' +u 'tempRcFile' ++noplugin$$"
 
 |+c| +
-||+c={command}||
+||+c {command}||
 ________________________________________________________________________________
 Execute a single Ex command after all initialization has been performed. See
 [j]initialization[j].
@@ -17,7 +17,7 @@ ________________________________________________________________________________
 
 
 |$$++cmd$$| +
-||$$++cmd={command}$$||
+||$$++cmd {command}$$||
 ________________________________________________________________________________
 Execute a single Ex command before any initialization has been performed. See
 [j]initialization[j].
@@ -27,7 +27,7 @@ ________________________________________________________________________________
 
 
 |+u| +
-||+u={rcfile}||
+||+u {rcfile}||
 ________________________________________________________________________________
 The file {rcfile} is used for user initialization commands. If {rcfile} is
 "NORC" then no startup initialization is performed except for the loading of