From b2270613d754044a03a888f9f1670adfebc49ce4 Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@users.noreply.github.com>
Date: Sat, 19 Mar 2016 20:26:36 -0600
Subject: [PATCH] Merge pull request #2896 from github/bring-back-logos

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

diff --git a/.gitmodules b/.gitmodules
index f8a54798..424f95f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -674,3 +674,6 @@
 [submodule "vendor/grammars/assembly"]
 	path = vendor/grammars/assembly
 	url = https://github.com/nanoant/assembly.tmbundle
+[submodule "vendor/grammars/logos"]
+	path = vendor/grammars/logos
+	url = https://github.com/Cykey/Sublime-Logos
diff --git a/grammars.yml b/grammars.yml
index d0e0b78d..d133cba7 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -375,6 +375,8 @@ vendor/grammars/lisp.tmbundle:
 - source.lisp
 vendor/grammars/llvm.tmbundle:
 - source.llvm
+vendor/grammars/logos:
+- source.logos
 vendor/grammars/logtalk.tmbundle:
 - source.logtalk
 vendor/grammars/lua.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 4bd742bf..3ce9acf6 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1963,7 +1963,7 @@ Logos:
   - .x
   - .xi
   ace_mode: text
-  tm_scope: none
+  tm_scope: source.logos
 
 Logtalk:
   type: programming
diff --git a/vendor/grammars/logos b/vendor/grammars/logos
new file mode 160000
index 00000000..e783d38b
--- /dev/null
+++ b/vendor/grammars/logos
@@ -0,0 +1 @@
+Subproject commit e783d38b9ce09c147b00fee971d125a69b9ad96a
diff --git a/vendor/licenses/grammar/logos.txt b/vendor/licenses/grammar/logos.txt
new file mode 100644
index 00000000..1ce23f9f
--- /dev/null
+++ b/vendor/licenses/grammar/logos.txt
@@ -0,0 +1,26 @@
+---
+type: grammar
+name: logos
+license: mit
+---
+The MIT License (MIT)
+
+Copyright (c) 2016 David Murray
+
+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.