From e7529166dfe9522aa20e8519f09c607b1beaf07b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 12 Feb 2011 11:57:51 -0500
Subject: [PATCH] Fix :map serialization bug.

--HG--
extra : rebase_source : bb62f05a95699fad0a64d07b35cd79fc653d89c7
---
 common/content/mappings.js | 6 +++---
 common/modules/styles.jsm  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/content/mappings.js b/common/content/mappings.js
index 804febb0..688a9932 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -539,7 +539,7 @@ var Mappings = Module("mappings", {
                                     {
                                         command: "map",
                                         options: array([
-                                            hive !== mappings.user && ["-group", hive.name],
+                                            hive.name !== "user" && ["-group", hive.name],
                                             ["-modes", uniqueModes(map.modes)],
                                             ["-description", map.description],
                                             map.silent && ["-silent"]])
@@ -568,12 +568,12 @@ var Mappings = Module("mappings", {
             commands.add([ch ? ch + "m[ap]" : "map"],
                 "Map a key sequence" + modeDescription,
                 function (args) { map(args, false); },
-                opts);
+                update({}, opts));
 
             commands.add([ch + "no[remap]"],
                 "Map a key sequence without remapping keys" + modeDescription,
                 function (args) { map(args, true); },
-                opts);
+                update({}, opts));
 
             commands.add([ch + "unm[ap]"],
                 "Remove a mapping" + modeDescription,
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index c61241c4..c80f8da7 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -242,7 +242,9 @@ var Hive = Class("Hive", {
  * @author Kris Maglione <maglione.k@gmail.com>
  */
 var Styles = Module("Styles", {
-    Local: function (dactyl, modules, window) ({}),
+    Local: function (dactyl, modules, window) ({
+        cleanup: function () {}
+    }),
 
     init: function () {
         this._id = 0;