From 84471a546371e6b0d05d18d244e0847f11a0256b Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@users.noreply.github.com>
Date: Wed, 23 Mar 2016 15:00:46 -0600
Subject: [PATCH] Merge pull request #2908 from github/grace

Adding grace grammar back in.
---
 .gitmodules                       |  3 +++
 grammars.yml                      |  2 ++
 lib/linguist/languages.yml        |  2 +-
 vendor/grammars/grace             |  1 +
 vendor/licenses/grammar/grace.txt | 25 +++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 160000 vendor/grammars/grace
 create mode 100644 vendor/licenses/grammar/grace.txt

diff --git a/.gitmodules b/.gitmodules
index 57cc914f..73c0a649 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -695,3 +695,6 @@
 [submodule "vendor/grammars/ats"]
 	path = vendor/grammars/ats
 	url = https://github.com/steinwaywhw/ats-mode-sublimetext
+[submodule "vendor/grammars/grace"]
+	path = vendor/grammars/grace
+	url = https://github.com/zmthy/grace-tmbundle
diff --git a/grammars.yml b/grammars.yml
index 61a3d1d1..f2f32f96 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -267,6 +267,8 @@ vendor/grammars/gnuplot-tmbundle:
 - source.gnuplot
 vendor/grammars/go-tmbundle:
 - source.go
+vendor/grammars/grace:
+- source.grace
 vendor/grammars/gradle.tmbundle:
 - source.groovy.gradle
 vendor/grammars/graphviz.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 48fa555b..8488f2ec 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1233,7 +1233,7 @@ Grace:
   type: programming
   extensions:
   - .grace
-  tm_scope: none
+  tm_scope: source.grace
   ace_mode: text
 
 Gradle:
diff --git a/vendor/grammars/grace b/vendor/grammars/grace
new file mode 160000
index 00000000..fa30c175
--- /dev/null
+++ b/vendor/grammars/grace
@@ -0,0 +1 @@
+Subproject commit fa30c175f7862fce7458284e01561e8f330993c6
diff --git a/vendor/licenses/grammar/grace.txt b/vendor/licenses/grammar/grace.txt
new file mode 100644
index 00000000..4a3fd0d5
--- /dev/null
+++ b/vendor/licenses/grammar/grace.txt
@@ -0,0 +1,25 @@
+---
+type: grammar
+name: grace
+license: mit
+---
+Copyright (c) 2011-2016 Timothy Jones
+
+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.