summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7dca0e0d3..881366ed5 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1742,6 +1742,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 93540829a..450aae48e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -479,6 +479,7 @@ let s:filename_checks = {
\ 'tilde': ['file.t.html'],
\ 'tli': ['file.tli'],
\ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf'],
+ \ 'toml': ['file.toml'],
\ 'tpp': ['file.tpp'],
\ 'treetop': ['file.treetop'],
\ 'trustees': ['trustees.conf'],
diff --git a/src/version.c b/src/version.c
index 28360de30..b0df92435 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2106,
+/**/
2105,
/**/
2104,