Merge branch 'refs/heads/NINJA-master' into TimelineUber

1 files changed, 3 insertions, 2 deletions

diff --git a/imports/codemirror/lib/util/overlay.js b/imports/codemirror/lib/util/overlay.js
index c4cdf9fc..1d5df6c6 100644
--- a/imports/codemirror/lib/util/overlay.js
+++ b/imports/codemirror/lib/util/overlay.js
@@ -6,7 +6,8 @@
 // overlay wins, unless the combine argument was true, in which case
 // the styles are combined.
 
-CodeMirror.overlayParser = function(base, overlay, combine) {
+// overlayParser is the old, deprecated name
+CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) {
   return {
     startState: function() {
       return {
@@ -43,7 +44,7 @@ CodeMirror.overlayParser = function(base, overlay, combine) {
       else return state.overlayCur;
     },
     
-    indent: function(state, textAfter) {
+    indent: base.indent && function(state, textAfter) {
       return base.indent(state.base, textAfter);
     },
     electricChars: base.electricChars