summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu, Zhenyu <wuzhenyu@ustc.edu>2024-03-31 19:15:49 +0200
committerChristian Brabandt <cb@256bit.org>2024-03-31 19:15:49 +0200
commit6b285c8cfd74e1da49fe17dca2ea9989bd9dae49 (patch)
tree0d359482f7233577b25b020ae2e67cddc3f3967d
parent665220a17b830a271f0c7ef07211d25cd1c7b389 (diff)
patch 9.1.0241: filetype: mysql history files are not recognizedv9.1.0241
Problem: filetype: mysql history files are not recognized Solution: Detect .mysql_history as mysql (Wu, Zhenyu) closes: #14362 Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 5af8ff6e84..6965fab523 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1398,7 +1398,7 @@ au BufNewFile,BufRead mrxvtrc,.mrxvtrc setf mrxvtrc
au BufNewFile,BufRead *.msql setf msql
" Mysql
-au BufNewFile,BufRead *.mysql setf mysql
+au BufNewFile,BufRead *.mysql,.mysql_history setf mysql
" Tcl Shell RC file
au BufNewFile,BufRead tclsh.rc setf tcl
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 2107776027..0a9a72d900 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -481,7 +481,7 @@ def s:GetFilenameChecks(): dict<list<string>>
'any/.muttng/muttrc', 'any/.muttng/muttrc-file',
'any/etc/Muttrc.d/file', 'muttngrc', 'muttngrc-file', 'muttrc',
'muttrc-file'],
- mysql: ['file.mysql'],
+ mysql: ['file.mysql', '.mysql_history'],
n1ql: ['file.n1ql', 'file.nql'],
named: ['namedfile.conf', 'rndcfile.conf', 'named-file.conf', 'named.conf', 'rndc-file.conf', 'rndc-file.key', 'rndc.conf', 'rndc.key'],
nanorc: ['/etc/nanorc', 'file.nanorc', 'any/etc/nanorc'],
diff --git a/src/version.c b/src/version.c
index c03de87d96..968ad9fed2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 241,
+/**/
240,
/**/
239,