From 1e502808c95a534f4eb2172c7b3cf8d6c89a5a08 Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon.smith@gmail.com>
Date: Thu, 2 Jun 2016 10:17:12 -0600
Subject: [PATCH 1/3] Removing old Elm grammar

---
 .gitmodules                    | 3 ---
 vendor/grammars/Elm.tmLanguage | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 vendor/grammars/Elm.tmLanguage

diff --git a/.gitmodules b/.gitmodules
index 2dfd20a5..0235d8f5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -446,9 +446,6 @@
 [submodule "vendor/grammars/Scalate.tmbundle"]
 	path = vendor/grammars/Scalate.tmbundle
 	url = https://github.com/scalate/Scalate.tmbundle
-[submodule "vendor/grammars/Elm.tmLanguage"]
-	path = vendor/grammars/Elm.tmLanguage
-	url = https://github.com/deadfoxygrandpa/Elm.tmLanguage
 [submodule "vendor/grammars/sublime-bsv"]
 	path = vendor/grammars/sublime-bsv
 	url = https://github.com/thotypous/sublime-bsv
diff --git a/vendor/grammars/Elm.tmLanguage b/vendor/grammars/Elm.tmLanguage
deleted file mode 160000
index 155ce91c..00000000
--- a/vendor/grammars/Elm.tmLanguage
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 155ce91c81a3b98fdf2785fe69b5460a3075d9f0

From 25b761b5065d9537dfc12b80fc51f0d65203015a Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon.smith@gmail.com>
Date: Thu, 2 Jun 2016 10:19:40 -0600
Subject: [PATCH 2/3] Moving to Elm community grammar

---
 .gitmodules                                             | 3 +++
 grammars.yml                                            | 2 ++
 vendor/grammars/Elm                                     | 1 +
 vendor/licenses/grammar/{Elm.tmLanguage.txt => Elm.txt} | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 160000 vendor/grammars/Elm
 rename vendor/licenses/grammar/{Elm.tmLanguage.txt => Elm.txt} (98%)

diff --git a/.gitmodules b/.gitmodules
index 0235d8f5..c774827a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -731,3 +731,6 @@
 [submodule "vendor/grammars/nu.tmbundle"]
 	path = vendor/grammars/nu.tmbundle
 	url = https://github.com/jsallis/nu.tmbundle
+[submodule "vendor/grammars/Elm"]
+	path = vendor/grammars/Elm
+	url = https://github.com/elm-community/Elm.tmLanguage
diff --git a/grammars.yml b/grammars.yml
index ae593508..316c0b2e 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -38,6 +38,8 @@ vendor/grammars/Docker.tmbundle:
 - source.dockerfile
 vendor/grammars/Elm.tmLanguage:
 - source.elm
+vendor/grammars/Elm/:
+- source.elm
 vendor/grammars/FreeMarker.tmbundle:
 - text.html.ftl
 vendor/grammars/G-Code/:
diff --git a/vendor/grammars/Elm b/vendor/grammars/Elm
new file mode 160000
index 00000000..227327e3
--- /dev/null
+++ b/vendor/grammars/Elm
@@ -0,0 +1 @@
+Subproject commit 227327e33e1ceecb7da9d276a89fef4f21ee64ed
diff --git a/vendor/licenses/grammar/Elm.tmLanguage.txt b/vendor/licenses/grammar/Elm.txt
similarity index 98%
rename from vendor/licenses/grammar/Elm.tmLanguage.txt
rename to vendor/licenses/grammar/Elm.txt
index 878d6862..7f04b933 100644
--- a/vendor/licenses/grammar/Elm.tmLanguage.txt
+++ b/vendor/licenses/grammar/Elm.txt
@@ -1,6 +1,6 @@
 ---
 type: grammar
-name: Elm.tmLanguage
+name: Elm
 license: mit
 ---
 The MIT License (MIT)

From 3bc540a283acc6e9d7f0c74d893e7ba24d1bbdee Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon.smith@gmail.com>
Date: Thu, 2 Jun 2016 10:29:57 -0600
Subject: [PATCH 3/3] Removing un-used grammar reference

---
 grammars.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/grammars.yml b/grammars.yml
index 316c0b2e..afaab00f 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -36,8 +36,6 @@ vendor/grammars/ColdFusion:
 - text.html.cfm
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
-vendor/grammars/Elm.tmLanguage:
-- source.elm
 vendor/grammars/Elm/:
 - source.elm
 vendor/grammars/FreeMarker.tmbundle: