Import r6948 from upstream hg supporting Firefox up to 24.*

[dactyl.git] / common / content / abbreviations.js

diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js
index 4b646446aa607139f3c151137b818571d8f8eb72..4013be29f68b27361e2b16a6b17b07b5d5d2179c 100644 (file)
--- 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))
@@ -380,4 +380,4 @@ var Abbreviations = Module("abbreviations", {
     }
 });
 
-// vim: set fdm=marker sw=4 ts=4 et:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et: