From edc3364306a0a03356b243b285aa424128241764 Mon Sep 17 00:00:00 2001
From: carsonreinke <carson@reinke.co>
Date: Thu, 25 Feb 2016 14:48:44 -0500
Subject: [PATCH 1/3] Updating for CodeMirror 5.12.0

---
 liquid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liquid.js b/liquid.js
index c76c47c..eb1911b 100644
--- a/liquid.js
+++ b/liquid.js
@@ -328,7 +328,7 @@ CodeMirror.defineMode("liquid", function(config, parserConfig) {
 CodeMirror.defineMIME("application/x-liquid-template", "liquid");
 
 CodeMirror.defineMode("htmlmixedliquid", function(config, parserConfig) {
-  return CodeMirror.overlayParser(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), CodeMirror.getMode(config, parserConfig.overlay || "application/x-liquid-template"));
+  return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), CodeMirror.getMode(config, parserConfig.overlay || "application/x-liquid-template"), false);
 });
 
 // Compatibility with CodeMirror's formatting addon

From b5ed295745be17930a39461016887ba21f818522 Mon Sep 17 00:00:00 2001
From: carsonreinke <carson@reinke.co>
Date: Thu, 25 Feb 2016 15:09:56 -0500
Subject: [PATCH 2/3] Moving files to appropriate CodeMirror directory
 structure Adding Bower

---
 .gitignore                           |  1 +
 bower.json                           | 23 +++++++++++++++++++++++
 liquid.css => mode/liquid/liquid.css |  0
 liquid.js => mode/liquid/liquid.js   |  0
 4 files changed, 24 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 bower.json
 rename liquid.css => mode/liquid/liquid.css (100%)
 rename liquid.js => mode/liquid/liquid.js (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ab079b0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+bower_components
\ No newline at end of file
diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000..4126920
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,23 @@
+{
+  "name": "liquid-codemirror",
+  "homepage": "https://github.com/carsonreinke/codemirror_liquid_mode",
+  "authors": [
+    "Henning Kiel"
+  ],
+  "description": "A CodeMirror mode for the liquid template language",
+  "main": [
+    "mode/liquid/liquid.js",
+    "mode/liquid/liquid.css"
+  ],
+  "moduleType": [],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "codemirror": "CodeMirror#^5.12.0"
+  }
+}
diff --git a/liquid.css b/mode/liquid/liquid.css
similarity index 100%
rename from liquid.css
rename to mode/liquid/liquid.css
diff --git a/liquid.js b/mode/liquid/liquid.js
similarity index 100%
rename from liquid.js
rename to mode/liquid/liquid.js

From 0ccd72d15379efb970d7d33750cc97ac770281fd Mon Sep 17 00:00:00 2001
From: carsonreinke <carson@reinke.co>
Date: Thu, 25 Feb 2016 15:29:06 -0500
Subject: [PATCH 3/3] Updating CodeMirror dependency to after v3.0

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 4126920..b9ea847 100644
--- a/bower.json
+++ b/bower.json
@@ -18,6 +18,6 @@
     "tests"
   ],
   "dependencies": {
-    "codemirror": "CodeMirror#^5.12.0"
+    "CodeMirror": ">=3.0"
   }
 }