summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7c4d109ffb..cbd677ceff 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -409,6 +409,9 @@ au BufNewFile,BufRead .clang-format setf yaml
" Clang-tidy
au BufNewFile,BufRead .clang-tidy setf yaml
+" Matplotlib style
+au BufNewFile,BufRead *.mplstyle setf yaml
+
" Clean
au BufNewFile,BufRead *.dcl,*.icl setf clean
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index df38038862..b1af7026d1 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -820,7 +820,7 @@ def s:GetFilenameChecks(): dict<list<string>>
xsd: ['file.xsd'],
xslt: ['file.xsl', 'file.xslt'],
yacc: ['file.yy', 'file.yxx', 'file.y++'],
- yaml: ['file.yaml', 'file.yml', 'file.eyaml', '.clangd', '.clang-format', '.clang-tidy'],
+ yaml: ['file.yaml', 'file.yml', 'file.eyaml', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle'],
yang: ['file.yang'],
yuck: ['file.yuck'],
z8a: ['file.z8a'],
diff --git a/src/version.c b/src/version.c
index ccc4e83583..2bf701cf6e 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 */
/**/
+ 237,
+/**/
236,
/**/
235,