summaryrefslogtreecommitdiff
path: root/common/modules/contexts.jsm
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2011-08-12 17:27:46 -0400
committerKris Maglione <maglione.k@gmail.com>2011-08-12 17:27:46 -0400
commit5e86f4ed939d5eb129488995bbff7db5bf529043 (patch)
tree11b11a3fa548fe68fe9292a4779b09303c98a1a6 /common/modules/contexts.jsm
parent0bcba9fb230abaa64bb74689285bafc448d95fb4 (diff)
downloadpentadactyl-5e86f4ed939d5eb129488995bbff7db5bf529043.tar.gz
Add -pentadactyl-remote command-line flag and CommandOption.STRINGMAP type.
--HG-- extra : rebase_source : a306ad6e8c2d019b92a6ff58414eb3ff8ab149b9
Diffstat (limited to 'common/modules/contexts.jsm')
-rw-r--r--common/modules/contexts.jsm5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm
index d7b8d7d9..9dad270b 100644
--- a/common/modules/contexts.jsm
+++ b/common/modules/contexts.jsm
@@ -516,8 +516,11 @@ var Contexts = Module("contexts", {
group.args = args["-args"];
}
- if (args.context)
+ if (args.context) {
args.context.group = group;
+ if (args.context.context)
+ args.context.context.group = group;
+ }
util.assert(!group.builtin ||
!["-description", "-locations", "-nopersist"]