summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-10-04 20:41:45 +0100
committerBram Moolenaar <Bram@vim.org>2021-10-04 20:41:45 +0100
commit78aa5ffe314f40d33666f03b833f66b11c3d0f67 (patch)
tree64cf5f1cc9c4fc9ed3c2db5088c53d08c867ca74
parent9af9fd6ab637ea507dd9015fa5a84a408c36c1e0 (diff)
downloadvim-git-78aa5ffe314f40d33666f03b833f66b11c3d0f67.tar.gz
patch 8.2.3473: some files with tcl syntax are not recognizedv8.2.3473
Problem: Some files with tcl syntax are not recognized. Solution: Add a few file patterns. (Doug Kearns
-rw-r--r--runtime/filetype.vim5
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 960ee3940..f8b2498fd 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1116,6 +1116,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
@@ -1811,7 +1814,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 42fe65a9c..b1aa7cd25 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -493,7 +493,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'],
diff --git a/src/version.c b/src/version.c
index 7d348c475..21aab4fbb 100644
--- 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 */
/**/
+ 3473,
+/**/
3472,
/**/
3471,