From 835ceae6f66959693e4d9a4ee5b36112d931a40e Mon Sep 17 00:00:00 2001
From: Arfon Smith <arfon@github.com>
Date: Fri, 18 Mar 2016 15:18:17 -0600
Subject: [PATCH] Removing x86 grammar

---
 .gitmodules                                          |  3 ---
 grammars.yml                                         |  5 -----
 lib/linguist/languages.yml                           | 12 ++++++------
 vendor/grammars/x86-assembly-textmate-bundle         |  1 -
 .../grammar/x86-assembly-textmate-bundle.txt         |  5 -----
 5 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 160000 vendor/grammars/x86-assembly-textmate-bundle
 delete mode 100644 vendor/licenses/grammar/x86-assembly-textmate-bundle.txt

diff --git a/.gitmodules b/.gitmodules
index edb9191e..739c28ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -166,9 +166,6 @@
 [submodule "vendor/grammars/Isabelle.tmbundle"]
 	path = vendor/grammars/Isabelle.tmbundle
 	url = https://github.com/lsf37/Isabelle.tmbundle
-[submodule "vendor/grammars/x86-assembly-textmate-bundle"]
-	path = vendor/grammars/x86-assembly-textmate-bundle
-	url = https://github.com/lunixbochs/x86-assembly-textmate-bundle
 [submodule "vendor/grammars/Alloy.tmbundle"]
 	path = vendor/grammars/Alloy.tmbundle
 	url = https://github.com/macekond/Alloy.tmbundle
diff --git a/grammars.yml b/grammars.yml
index 96e21bae..b80a3755 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -170,9 +170,6 @@ vendor/grammars/asciidoc.tmbundle/:
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
-vendor/grammars/assembly.tmbundle:
-- objdump.x86asm
-- source.x86asm
 vendor/grammars/atom-fsharp/:
 - source.fsharp
 - source.fsharp.fsi
@@ -575,8 +572,6 @@ vendor/grammars/verilog.tmbundle:
 - source.verilog
 vendor/grammars/vue-syntax-highlight:
 - text.html.vue
-vendor/grammars/x86-assembly-textmate-bundle:
-- source.asm.x86
 vendor/grammars/xc.tmbundle/:
 - source.xc
 vendor/grammars/xml.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 401a098d..35ed8ff0 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -230,7 +230,7 @@ Assembly:
   - .a51
   - .inc
   - .nasm
-  tm_scope: source.asm.x86
+  tm_scope: none
   ace_mode: assembly_x86
 
 Augeas:
@@ -429,7 +429,7 @@ C-ObjDump:
   type: data
   extensions:
   - .c-objdump
-  tm_scope: objdump.x86asm
+  tm_scope: none
   ace_mode: assembly_x86
 
 C2hs Haskell:
@@ -681,7 +681,7 @@ Cpp-ObjDump:
   - .c++objdump
   - .cpp-objdump
   - .cxx-objdump
-  tm_scope: objdump.x86asm
+  tm_scope: none
   aliases:
   - c++-objdumb
   ace_mode: assembly_x86
@@ -753,7 +753,7 @@ D-ObjDump:
   type: data
   extensions:
   - .d-objdump
-  tm_scope: objdump.x86asm
+  tm_scope: none
   ace_mode: assembly_x86
 
 DIGITAL Command Language:
@@ -1107,7 +1107,7 @@ GAS:
   extensions:
   - .s
   - .ms
-  tm_scope: source.asm.x86
+  tm_scope: none
   ace_mode: assembly_x86
 
 GDScript:
@@ -2420,7 +2420,7 @@ ObjDump:
   type: data
   extensions:
   - .objdump
-  tm_scope: objdump.x86asm
+  tm_scope: none
   ace_mode: assembly_x86
 
 Objective-C:
diff --git a/vendor/grammars/x86-assembly-textmate-bundle b/vendor/grammars/x86-assembly-textmate-bundle
deleted file mode 160000
index f6c4d3ae..00000000
--- a/vendor/grammars/x86-assembly-textmate-bundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f6c4d3ae596cdad8e9f6442b3a8daffd3530ab50
diff --git a/vendor/licenses/grammar/x86-assembly-textmate-bundle.txt b/vendor/licenses/grammar/x86-assembly-textmate-bundle.txt
deleted file mode 100644
index d51e2733..00000000
--- a/vendor/licenses/grammar/x86-assembly-textmate-bundle.txt
+++ /dev/null
@@ -1,5 +0,0 @@
----
-type: grammar
-name: x86-assembly-textmate-bundle
-license: other
----