From e5864bfd235e805fa0af301a41dc88f61e8c3006 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 14 Aug 2013 22:28:28 +1000
Subject: [PATCH] Fix RC serialization and RHS expansion in abbreviations using
 -js.

Fixes issue #911.
---
 common/content/abbreviations.js | 2 +-
 common/modules/contexts.jsm     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js
index 29908475..4013be29 100644
--- a/common/content/abbreviations.js
+++ b/common/content/abbreviations.js
@@ -347,7 +347,7 @@ var Abbreviations = Module("abbreviations", {
                             arguments: [abbr.lhs],
                             literalArg: abbr.rhs,
                             options: {
-                                "-javascript": abbr.rhs ? null : undefined
+                                "-javascript": callable(abbr.rhs) ? null : undefined
                             }
                         }
                         for ([, abbr] in Iterator(abbreviations.user.merged))
diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm
index 3a722b36..b20616ab 100644
--- a/common/modules/contexts.jsm
+++ b/common/modules/contexts.jsm
@@ -546,7 +546,7 @@ var Contexts = Module("contexts", {
             if (callable(params))
                 action = dactyl.userEval("(function action() { with (action.makeParams(this, arguments)) {" + args.literalArg + "} })");
             else
-                action = dactyl.userFunc.apply(dactyl, params.concat(args.literalArg).array);
+                action = dactyl.userFunc.apply(dactyl, params.concat(args.literalArg));
             process = function (param) isObject(param) && param.valueOf ? param.valueOf() : param;
             action.params = params;
             action.makeParams = makeParams;