patch 9.1.1730: filetype: vivado journal/log files are not recognized

Problem:  filetype: vivado journal/log files are not recognized
Solution: Detect vivado*.{jou,log} as tcl filetype (Wu Zhenyu).

closes: #18191

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e1354a503ab3484612fc290f1cd014ea1872207f..d53a2126f2b502b5df4f28699aba7451afdb5ce0 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1676,7 +1676,9 @@ au BufNewFile,BufRead *.msql                      setf msql
 au BufNewFile,BufRead *.mysql,.mysql_history   setf mysql
 
 " Tcl Shell RC file
-au BufNewFile,BufRead tclsh.rc                 setf tcl
+" Vivado journal file records REPL input in tcl syntax
+" Vivado log file records REPL input in tcl syntax and output
+au BufNewFile,BufRead tclsh.rc,vivado*.{jou,log}       setf tcl
 
 " M$ Resource files
 " /etc/Muttrc.d/file.rc is muttrc

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 829ba8f2ee968e8d7b08a7fbb8fa61a60c5413f8..ee0eaa095017cf77ebc50182a3badda5201162cb 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -823,7 +823,8 @@ def s:GetFilenameChecks(): dict<list<string>>
     tal: ['file.tal'],
     taskdata: ['pending.data', 'completed.data', 'undo.data'],
     taskedit: ['file.task'],
-    tcl: ['file.tcl', 'file.tm', 'file.tk', 'file.itcl', 'file.itk', 'file.jacl', '.tclshrc', 'tclsh.rc', '.wishrc', '.tclsh-history', '.xsctcmdhistory', '.xsdbcmdhistory'],
+    tcl: ['file.tcl', 'file.tm', 'file.tk', 'file.itcl', 'file.itk', 'file.jacl', '.tclshrc', 'tclsh.rc', '.wishrc', '.tclsh-history',
+          '.xsctcmdhistory', '.xsdbcmdhistory', 'vivado.jou', 'vivado.log'],
     teal: ['file.tl'],
     templ: ['file.templ'],
     template: ['file.tmpl'],

diff --git a/src/version.c b/src/version.c
index 18623c88ea4b57584e60a31593a8b365a1e0ecae..aa3897faa0eecfcab4fa8916508eacef49d869d2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1730,
 /**/
     1729,
 /**/