commit e519eb41c1c12836b2d12aeb703bb04c7618a724
author Eric Pruitt <eric.pruitt@gmail.com> Tue Oct 12 13:58:23 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Oct 12 13:58:23 2021 +0100
tree 7f2cd4764d37c116b7fd9d20fca1c265d54aeeec
parent 3a724290c5dd8e4b7c9a1fa8941b81f6f80db00a

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)

src/testdir/test_filetype.vim

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0a55ca6..557cf5e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -504,7 +504,7 @@
     \ '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'],

src/version.c

diff --git a/src/version.c b/src/version.c
index e09abfa..1f292bb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3501,
+/**/
     3500,
 /**/
     3499,