diff options
| author | Eric Pruitt <eric.pruitt@gmail.com> | 2021-10-12 13:58:23 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-12 13:58:23 +0100 |
| commit | e519eb41c1c12836b2d12aeb703bb04c7618a724 (patch) | |
| tree | 7f2cd4764d37c116b7fd9d20fca1c265d54aeeec | |
| parent | 3a724290c5dd8e4b7c9a1fa8941b81f6f80db00a (diff) | |
| download | vim-git-e519eb41c1c12836b2d12aeb703bb04c7618a724.tar.gz | |
patch 8.2.3501: tmux filetype dection is incompletev8.2.3501
Problem: tmux filetype dection is incomplete
Solution: Also use tmux for files having text after .conf. (Eric Pruitt,
closes #8971)
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 9b18b1b73..247e873d0 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2305,6 +2305,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 0a55ca650..557cf5e15 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -504,7 +504,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'], diff --git a/src/version.c b/src/version.c index e09abfa22..1f292bbde 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3501, +/**/ 3500, /**/ 3499, |