To: vim_dev@googlegroups.com Subject: Patch 8.2.3501 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3501 Problem: tmux filetype dection is incomplete Solution: Also use tmux for files having text after .conf. (Eric Pruitt, closes #8971) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.3500/runtime/filetype.vim 2021-10-09 16:28:52.782895348 +0100 --- runtime/filetype.vim 2021-10-12 13:50:04.353324398 +0100 *************** *** 2305,2310 **** --- 2305,2313 ---- " 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') *** ../vim-8.2.3500/src/testdir/test_filetype.vim 2021-10-09 16:28:52.782895348 +0100 --- src/testdir/test_filetype.vim 2021-10-12 13:50:04.353324398 +0100 *************** *** 504,510 **** \ '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'], \ 'toml': ['file.toml'], \ 'tpp': ['file.tpp'], \ 'treetop': ['file.treetop'], --- 504,510 ---- \ '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.conf.local'], \ 'toml': ['file.toml'], \ 'tpp': ['file.tpp'], \ 'treetop': ['file.treetop'], *** ../vim-8.2.3500/src/version.c 2021-10-12 12:02:45.359105514 +0100 --- src/version.c 2021-10-12 13:57:23.543472383 +0100 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 3501, /**/ -- hundred-and-one symptoms of being an internet addict: 134. You consider bandwidth to be more important than carats. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///