Merge pull request #3223 from Alhadis/vimscript

Swap grammar used for Vimscript highlighting

.gitmodules

@@ -22,9 +22,9 @@
 [submodule "vendor/grammars/Sublime-REBOL"]
 	path = vendor/grammars/Sublime-REBOL
 	url = https://github.com/Oldes/Sublime-REBOL
-[submodule "vendor/grammars/Sublime-VimL"]
-	path = vendor/grammars/Sublime-VimL
-	url = https://github.com/SalGnt/Sublime-VimL
+[submodule "vendor/grammars/language-viml"]
+	path = vendor/grammars/language-viml
+	url = https://github.com/Alhadis/language-viml
 [submodule "vendor/grammars/ColdFusion"]
 	path = vendor/grammars/ColdFusion
 	url = https://github.com/SublimeText/ColdFusion

grammars.yml

@@ -103,8 +103,6 @@ vendor/grammars/Sublime-SQF-Language:
 vendor/grammars/Sublime-Text-2-OpenEdge-ABL:
 - source.abl
 - text.html.abl
-vendor/grammars/Sublime-VimL:
-- source.viml
 vendor/grammars/SublimeBrainfuck:
 - source.bf
 vendor/grammars/SublimeClarion:
@@ -414,6 +412,8 @@ vendor/grammars/language-toc-wow:
 - source.toc
 vendor/grammars/language-turing:
 - source.turing
+vendor/grammars/language-viml:
+- source.viml
 vendor/grammars/language-wavefront:
 - source.wavefront.mtl
 - source.wavefront.obj

lib/linguist/languages.yml

@@ -4001,6 +4001,7 @@ VimL:
   type: programming
   color: "#199f4b"
   search_term: vim
+  tm_scope: source.viml
   aliases:
   - vim
   - nvim

vendor/licenses/grammar/language-viml.txt

@@ -1,11 +1,12 @@
 ---
 type: grammar
-name: Sublime-VimL
+name: language-viml
 license: mit
 ---
 The MIT License (MIT)
 
-Copyright (c) 2014 Max Vasiliev, Salvatore Gentile
+Copyright (c) 2014-2016 Evan Hahn
+Copyright (c) 2016 John Gardner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -14,13 +15,13 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.