aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-07 18:22:03 -0500
committerGitHub <noreply@github.com>2020-12-07 18:22:03 -0500
commit4383c0f95245d1b98cac28177ade270bf73f008f (patch)
treebe468dfe056b77aaf63b395a75da168e5c8a89cf
parent85bce4d13d405fe009428def4fbead54bb741008 (diff)
parent8329f624de048c0cedaf0e8c1fc43b253e49c48c (diff)
downloadrneovim-4383c0f95245d1b98cac28177ade270bf73f008f.tar.gz
rneovim-4383c0f95245d1b98cac28177ade270bf73f008f.tar.bz2
rneovim-4383c0f95245d1b98cac28177ade270bf73f008f.zip
Merge pull request #13478 from seandewar/vim-8.2.2106
vim-patch:8.2.2106: TOML files are not recognized
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/nvim/testdir/test_filetype.vim1
2 files changed, 4 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ed19fa1a43..ed3204c537 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1744,6 +1744,9 @@ au BufNewFile,BufRead *.tf,.tfrc,tfrc setf tf
" tmux configuration
au BufNewFile,BufRead {.,}tmux*.conf setf tmux
+" TOML
+au BufNewFile,BufRead *.toml setf toml
+
" TPP - Text Presentation Program
au BufNewFile,BufReadPost *.tpp setf tpp
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index f3c3e085f6..356a7ce135 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -463,6 +463,7 @@ let s:filename_checks = {
\ 'tilde': ['file.t.html'],
\ 'tli': ['file.tli'],
\ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf'],
+ \ 'toml': ['file.toml'],
\ 'tpp': ['file.tpp'],
\ 'treetop': ['file.treetop'],
\ 'trustees': ['trustees.conf'],