aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordundargoc <33953936+dundargoc@users.noreply.github.com>2021-10-16 02:01:36 +0200
committerGitHub <noreply@github.com>2021-10-15 20:01:36 -0400
commit1ced6cf08c1bf819df76e3830ae12f76e987f151 (patch)
treeb9d786c55950f288a1fe0b77529b301198a2ad66 /src
parent68b2a9e5693592d98d8a3e84bcad288704f66bb1 (diff)
downloadrneovim-1ced6cf08c1bf819df76e3830ae12f76e987f151.tar.gz
rneovim-1ced6cf08c1bf819df76e3830ae12f76e987f151.tar.bz2
rneovim-1ced6cf08c1bf819df76e3830ae12f76e987f151.zip
vim-patch:8.2.3501: tmux filetype dection is incomplete (#16021)
Problem: tmux filetype dection is incomplete Solution: Also use tmux for files having text after .conf. (Eric Pruitt, closes vim/vim#8971) https://github.com/vim/vim/commit/e519eb41c1c12836b2d12aeb703bb04c7618a724
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/test_filetype.vim2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 52e6ba64cc..3a825fe7f1 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -503,7 +503,7 @@ let s:filename_checks = {
\ 'tidy': ['.tidyrc', 'tidyrc', 'tidy.conf'],
\ 'tilde': ['file.t.html'],
\ 'tli': ['file.tli'],
- \ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf'],
+ \ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf', 'tmux.conf.local'],
\ 'toml': ['file.toml'],
\ 'tpp': ['file.tpp'],
\ 'treetop': ['file.treetop'],