summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,