diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2021-10-16 02:01:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 20:01:36 -0400 |
| commit | 1ced6cf08c1bf819df76e3830ae12f76e987f151 (patch) | |
| tree | b9d786c55950f288a1fe0b77529b301198a2ad66 | |
| parent | 68b2a9e5693592d98d8a3e84bcad288704f66bb1 (diff) | |
| download | rneovim-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
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index c86ca9646b..a9202f2b9e 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2301,6 +2301,9 @@ au BufNewFile,BufRead .tcshrc* call dist#ft#SetFileTypeShell("tcsh") " csh scripts ending in a star au BufNewFile,BufRead .login*,.cshrc* call dist#ft#CSH() +" tmux configuration with arbitrary extension +au BufNewFile,BufRead {.,}tmux*.conf* setf tmux + " VHDL au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl') 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'], |