aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <christian.clason@uni-due.de>2021-10-05 13:21:52 +0200
committerGitHub <noreply@github.com>2021-10-05 04:21:52 -0700
commita2734efdc25e2ac9ee4874b8604242e54f016517 (patch)
tree9d7214093ced30f37da8714c775ec1fec6bce068
parent93a7571faba529f7b3e527336e933731eb91bbec (diff)
downloadrneovim-a2734efdc25e2ac9ee4874b8604242e54f016517.tar.gz
rneovim-a2734efdc25e2ac9ee4874b8604242e54f016517.tar.bz2
rneovim-a2734efdc25e2ac9ee4874b8604242e54f016517.zip
vim-patch:8.2.3473: some tcl files are not recognized #15912
Problem: Some files with tcl syntax are not recognized. Solution: Add a few file patterns. (Doug Kearns) https://github.com/vim/vim/commit/78aa5ffe314f40d33666f03b833f66b11c3d0f67
-rw-r--r--runtime/filetype.vim5
-rw-r--r--src/nvim/testdir/test_filetype.vim2
2 files changed, 5 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 322215e1de..fe0073f16b 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1109,6 +1109,9 @@ au BufNewFile,BufRead *.mysql setf mysql
" Mutt setup files (must be before catch *.rc)
au BufNewFile,BufRead */etc/Muttrc.d/* call s:StarSetf('muttrc')
+" Tcl Shell RC file
+au BufNewFile,BufRead tclsh.rc setf tcl
+
" M$ Resource files
au BufNewFile,BufRead *.rc,*.rch setf rc
@@ -1804,7 +1807,7 @@ au BufRead,BufNewFile {pending,completed,undo}.data setf taskdata
au BufRead,BufNewFile *.task setf taskedit
" Tcl (JACL too)
-au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl setf tcl
+au BufNewFile,BufRead *.tcl,*.tm,*.tk,*.itcl,*.itk,*.jacl,.tclshrc,.wishrc setf tcl
" TealInfo
au BufNewFile,BufRead *.tli setf tli
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 4a9cb4a8d8..cca89cbd6d 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -492,7 +492,7 @@ let s:filename_checks = {
\ 'tak': ['file.tak'],
\ 'taskdata': ['pending.data', 'completed.data', 'undo.data'],
\ 'taskedit': ['file.task'],
- \ 'tcl': ['file.tcl', 'file.tk', 'file.itcl', 'file.itk', 'file.jacl'],
+ \ 'tcl': ['file.tcl', 'file.tm', 'file.tk', 'file.itcl', 'file.itk', 'file.jacl', '.tclshrc', 'tclsh.rc', '.wishrc'],
\ 'teraterm': ['file.ttl'],
\ 'terminfo': ['file.ti'],
\ 'tex': ['file.latex', 'file.sty', 'file.dtx', 'file.ltx', 'file.bbl'],