From 5155ad89e8d9b2ae0834656bb733e3847c22bde4 Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@users.noreply.github.com>
Date: Mon, 9 May 2016 20:55:49 -0600
Subject: [PATCH] Adding back Creole grammar (#2999)

---
 .gitmodules                        |  3 +++
 grammars.yml                       |  2 ++
 lib/linguist/languages.yml         |  2 +-
 vendor/grammars/creole             |  1 +
 vendor/licenses/grammar/creole.txt | 19 +++++++++++++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 160000 vendor/grammars/creole
 create mode 100644 vendor/licenses/grammar/creole.txt

diff --git a/.gitmodules b/.gitmodules
index 7305170c..7a89185f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -725,3 +725,6 @@
 [submodule "vendor/grammars/sublime-clips"]
 	path = vendor/grammars/sublime-clips
 	url = https://github.com/psicomante/CLIPS-sublime
+[submodule "vendor/grammars/creole"]
+	path = vendor/grammars/creole
+	url = https://github.com/Siddley/Creole
diff --git a/grammars.yml b/grammars.yml
index 9140c82f..9e6f37f5 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -219,6 +219,8 @@ vendor/grammars/cool-tmbundle:
 vendor/grammars/cpp-qt.tmbundle:
 - source.c++.qt
 - source.qmake
+vendor/grammars/creole/:
+- text.html.creole
 vendor/grammars/css.tmbundle:
 - source.css
 vendor/grammars/cucumber-tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 59c8c0b0..be89c03c 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -702,7 +702,7 @@ Creole:
   wrap: true
   extensions:
   - .creole
-  tm_scope: none
+  tm_scope: text.html.creole
   ace_mode: text
 
 Crystal:
diff --git a/vendor/grammars/creole b/vendor/grammars/creole
new file mode 160000
index 00000000..cdc8adc3
--- /dev/null
+++ b/vendor/grammars/creole
@@ -0,0 +1 @@
+Subproject commit cdc8adc30693b737af4d633a3cd2e50530db45c1
diff --git a/vendor/licenses/grammar/creole.txt b/vendor/licenses/grammar/creole.txt
new file mode 100644
index 00000000..0fc5ef94
--- /dev/null
+++ b/vendor/licenses/grammar/creole.txt
@@ -0,0 +1,19 @@
+---
+type: grammar
+name: creole
+license: mit
+---
+The MIT License (MIT)
+Copyright (c) 2012 Siddley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files 
+(the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, 
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.