apply changes made by caisui

Author: Segaja

common/content/commands.js

@@ -548,6 +548,8 @@ const Commands = Module("commands", {
         var onlyArgumentsRemaining = allowUnknownOptions || (options.length == 0 && subCommands.length == 0) || false; // after a -- has been found
         var arg = null;
         var count = 0; // the length of the argument
+        var quote = null;
+        var error = null;
         var i = 0;
         var completeOpts;
 
@@ -692,7 +694,7 @@ const Commands = Module("commands", {
             }
 
             // if not an option, treat this token as an argument
-            let [count, arg, quote, error] = getNextArg(sub);
+            [count, arg, quote, error] = getNextArg(sub);
             liberator.assert(!error, error);
 
             if (complete) {

common/content/options.js

@@ -123,11 +123,11 @@ const Option = Class("Option", {
         else
             scope = this.scope;
 
+        let value;
         // Options with a custom getter are always responsible for returning a meaningful value
         if (this.getter)
             return liberator.trapErrors(this.getter, this, value);
 
-        let value;
         if (liberator.has("tabs") && (scope & Option.SCOPE_LOCAL))
             value = tabs.options[this.name];
         if ((scope & Option.SCOPE_GLOBAL) && (value == undefined))