Merge branch 'refs/heads/master' into v0.7.1

1 files changed, 3 insertions, 1 deletions

diff --git a/imports/codemirror/mode/htmlmixed/htmlmixed.js b/imports/codemirror/mode/htmlmixed/htmlmixed.js
index c66a6583..a6c62c9d 100644
--- a/imports/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/imports/codemirror/mode/htmlmixed/htmlmixed.js
@@ -73,11 +73,13 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     },
 
     compareStates: function(a, b) {
+      if (a.mode != b.mode) return false;
+      if (a.localState) return CodeMirror.Pass;
       return htmlMode.compareStates(a.htmlState, b.htmlState);
     },
 
     electricChars: "/{}:"
   }
-});
+}, "xml", "javascript", "css");
 
 CodeMirror.defineMIME("text/html", "htmlmixed");