diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js
index 1b3f76a3..cde225c1 100644
--- a/common/content/abbreviations.js
+++ b/common/content/abbreviations.js
@@ -247,19 +247,20 @@ var Abbreviations = Module("abbreviations", {
                         abbreviations.add(modes, lhs, rhs);
                     }
                 }, {
-                    options: [
-                        {
-                            names: ["-javascript", "-js", "-j"],
-                            description: "Expand this abbreviation by evaluating its right-hand-side as JavaScript"
-                        }
-                    ],
                     completer: function (context, args) {
                         if (args.length == 1)
                             return completion.abbreviation(context, modes);
                         else if (args["-javascript"])
                             return completion.javascript(context);
                     },
+                    hereDoc: true,
                     literal: 1,
+                    options: [
+                        {
+                            names: ["-javascript", "-js", "-j"],
+                            description: "Expand this abbreviation by evaluating its right-hand-side as JavaScript"
+                        }
+                    ],
                     serialize: function () [
                         {
                             command: this.name,
diff --git a/common/content/autocommands.js b/common/content/autocommands.js
index 802b1ecd..98fe7ac6 100644
--- a/common/content/autocommands.js
+++ b/common/content/autocommands.js
@@ -178,6 +178,7 @@ var AutoCommands = Module("autocommands", {
                     if (args.length == 3)
                         return args["-javascript"] ? completion.javascript(context) : completion.ex(context);
                 },
+                hereDoc: true,
                 literal: 2,
                 options: [
                     {
diff --git a/common/content/commands.js b/common/content/commands.js
index 5b0d2218..26be1d79 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -1365,6 +1365,7 @@ var Commands = Module("commands", {
                     else
                         args["-javascript"] ? completion.javascript(context) : completion.ex(context);
                 },
+                hereDoc: true,
                 options: [
                     { names: ["-bang", "-b"],  description: "Command may be followed by a !" },
                     { names: ["-count", "-c"], description: "Command may be preceded by a count" },
diff --git a/common/content/mappings.js b/common/content/mappings.js
index 7480f739..a77f03ed 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -389,6 +389,7 @@ var Mappings = Module("mappings", {
                                 return completion.ex(context);
                         }
                     },
+                    hereDoc: true,
                     literal: 1,
                     options: [
                         {