patch 8.2.3501: tmux filetype dection is incomplete

Problem:    tmux filetype dection is incomplete
Solution:   Also use tmux for files having text after .conf. (Eric Pruitt,
            closes #8971)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9b18b1b73a2f155f07d0461ebfccf81a585a388b..247e873d0f0e916bafb5ad9a1874cb94ec4bf81f 100644 (file)
--- 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 0a55ca650d2ea486a5b163858cb9f0395239c67b..557cf5e157d45848f0dd0adda373b75567ad510e 100644 (file)
--- 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 e09abfa22d5500f7c3020c4ef99eb509e9ca1cb8..1f292bbde68cb6bdfe742052227d3cbe2a358d43 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3501,
 /**/
     3500,
 /**/