Merge branch 'refs/heads/Ninja-Internal' into Color

2 files changed, 5 insertions, 0 deletions

diff --git a/imports/codemirror/mode/xmlpure/index.html b/imports/codemirror/mode/xmlpure/index.html
index 721834ac..721834ac 100755..100644
--- a/imports/codemirror/mode/xmlpure/index.html
+++ b/imports/codemirror/mode/xmlpure/index.html
diff --git a/imports/codemirror/mode/xmlpure/xmlpure.js b/imports/codemirror/mode/xmlpure/xmlpure.js
index 6102f51d..18d710cf 100755..100644
--- a/imports/codemirror/mode/xmlpure/xmlpure.js
+++ b/imports/codemirror/mode/xmlpure/xmlpure.js
@@ -15,6 +15,7 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) {
     var STYLE_ATTRIBUTE = "attribute";
     var STYLE_WORD = "string";
     var STYLE_TEXT = "atom";
+    var STYLE_ENTITIES = "string";
 
     var TAG_INSTRUCTION = "!instruction";
     var TAG_CDATA = "!cdata";
@@ -290,6 +291,10 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) {
                 state.tokenize = parseElementTagName;
                 return STYLE_ELEMENT_NAME;
             }
+        } else if(stream.eat("&")) {
+            stream.eatWhile(/[^;]/);
+            stream.eat(";");
+            return STYLE_ENTITIES;
         } else {
             // new context: text
             pushContext(state, TAG_TEXT);