Mercurial > vim

changeset 25935:c90b8e41b10e v8.2.3501

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3501: tmux filetype dection is incomplete Commit: https://github.com/vim/vim/commit/e519eb41c1c12836b2d12aeb703bb04c7618a724 Author: Eric Pruitt <eric.pruitt@gmail.com> Date: Tue Oct 12 13:58:23 2021 +0100 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)
author Bram Moolenaar <Bram@vim.org>
date Tue, 12 Oct 2021 15:00:06 +0200
parents 6e0e4d0a0259
children 76c5e7e484d1
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2305,6 +2305,9 @@ au BufNewFile,BufRead .tcshrc*	call dist
 " 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')
 
--- 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'],
--- 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,