Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix

2 files changed, 18 insertions, 4 deletions

diff --git a/imports/codemirror/mode/stex/stex.js b/imports/codemirror/mode/stex/stex.js
index b89e619e..c0739ded 100644
--- a/imports/codemirror/mode/stex/stex.js
+++ b/imports/codemirror/mode/stex/stex.js
@@ -85,10 +85,12 @@ CodeMirror.defineMode("stex", function(cmCfg, modeCfg)
         if (source.match(/^\\[a-zA-Z@]+/)) {
             var cmdName = source.current();
             cmdName = cmdName.substr(1, cmdName.length-1);
-            var plug = plugins[cmdName];
-            if (typeof(plug) == 'undefined') {
-                plug = plugins["DEFAULT"];
-            }
+            var plug;
+            if (plugins.hasOwnProperty(cmdName)) {
+              plug = plugins[cmdName];
+            } else {
+              plug = plugins["DEFAULT"];
+            }
             plug = new plug();
             pushCommand(state, plug);
             setState(state, beginParams);
diff --git a/imports/codemirror/mode/stex/test.html b/imports/codemirror/mode/stex/test.html
index b53a6a24..a60f4184 100644
--- a/imports/codemirror/mode/stex/test.html
+++ b/imports/codemirror/mode/stex/test.html
@@ -241,6 +241,18 @@
 
     </script>
 
+    <h2>New Commands</h2>
+
+    Should be able to define a new command that happens to be a method on Array
+    (e.g. <tt>pop</tt>):
+    <script language="javascript">
+      MT.test('\\newcommand{\\pop}',
+        'tag', '\\newcommand',
+        'bracket', '{',
+        'tag', '\\pop',
+        'bracket', '}');
+    </script>
+
     <h2>Summary</h2>
     <script language="javascript">
       MT.printSummary();