Fix <C-v> in PASS THROUGH mode. Closes issue #223.

4 files changed, 6 insertions, 4 deletions

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 17e82fc4..eca4e029 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -64,6 +64,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                         mod.destroy();
                 }
             }
+
             for (let name in values(Object.getOwnPropertyNames(modules).reverse()))
                 try {
                     delete modules[name];
diff --git a/common/content/modes.js b/common/content/modes.js
index 80b9c22e..b7394049 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -108,7 +108,7 @@ var Modes = Module("modes", {
             hidden: true,
             description: "Quote mode: The next key sequence is ignored by " + config.appName + ", unless in Pass Through mode",
             display: function () modes.getStack(1).main == modes.PASS_THROUGH
-                ? (modes.getStack(2).main.display() || modes.getStack(2).mainMode.name) + " (next)"
+                ? (modes.getStack(2).main.display() || modes.getStack(2).main.name) + " (next)"
                 : "PASS THROUGH (next)"
         }, {
             // Fix me.
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 525c763b..f4bf503a 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -613,10 +613,10 @@ function call(fn) {
  * value of the property.
  */
 function memoize(obj, key, getter) {
-    obj.__defineGetter__(key, function replace() (
+    obj.__defineGetter__(key, function g_replaceProperty() (
         Class.replaceProperty(this.instance || this, key, null),
         Class.replaceProperty(this.instance || this, key, getter.call(this, key))));
-    obj.__defineSetter__(key, function replace(val)
+    obj.__defineSetter__(key, function s_replaceProperty(val)
         Class.replaceProperty(this.instance || this, key, val));
 }
 
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 837ddf2e..b871a7bf 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -209,7 +209,6 @@ var Overlay = Module("Overlay", {
                         }
                     }
                 }
-                defineModule.modules.map(init);
 
                 function load(module, prereq, frame) {
                     if (isString(module)) {
@@ -246,6 +245,8 @@ var Overlay = Module("Overlay", {
                     return modules[module.className];
                 }
 
+                defineModule.modules.map(init);
+
                 Module.list.forEach(load);
                 deferredInit["load"].forEach(call);
                 modules.times = update({}, defineModule.times);