aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua/vim
diff options
context:
space:
mode:
authorGregory Anders <8965202+gpanders@users.noreply.github.com>2024-09-17 17:20:50 -0500
committerGitHub <noreply@github.com>2024-09-17 17:20:50 -0500
commit0ade8fed143dd8cf3ca0571eb4ed66ff27bc0325 (patch)
treeac342e53f11b231db87fe6fdab4780b3f00618af /runtime/lua/vim
parenta0d8c2b86e788ce4273f0b8df258cd9e8e432d38 (diff)
parent9a3f74c4c7fa567bb492cc3604b6baca05c22f1a (diff)
downloadrneovim-0ade8fed143dd8cf3ca0571eb4ed66ff27bc0325.tar.gz
rneovim-0ade8fed143dd8cf3ca0571eb4ed66ff27bc0325.tar.bz2
rneovim-0ade8fed143dd8cf3ca0571eb4ed66ff27bc0325.zip
Merge pull request #30411 from gpanders/vim-9.1.0734
vim-patch:9.1.{0734,0735}
Diffstat (limited to 'runtime/lua/vim')
-rw-r--r--runtime/lua/vim/filetype.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index bfe700f8dd..bd55c97f15 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -612,6 +612,7 @@ local extension = {
jsx = 'javascriptreact',
clp = 'jess',
jgr = 'jgraph',
+ jinja = 'jinja',
jjdescription = 'jj',
j73 = 'jovial',
jov = 'jovial',
@@ -1023,6 +1024,7 @@ local extension = {
rake = 'ruby',
rs = 'rust',
sage = 'sage',
+ sls = 'salt',
sas = 'sas',
sass = 'sass',
sa = 'sather',