summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu, Zhenyu <wuzhenyu@ustc.edu>2024-04-13 18:25:38 +0200
committerChristian Brabandt <cb@256bit.org>2024-04-13 18:25:38 +0200
commit55d4f3c006689945599589a90036923b1752754f (patch)
tree9fd6fddfdf5ab6681ca01652ba5cece1564242b2
parentce06493aeb3d198d13de289ac39d1ed0f1604429 (diff)
patch 9.1.0317: filetype: matplotlibrc files are not recognizedv9.1.0317
Problem: filetype: matplotlibrc files are not recognized Solution: Detect 'matplotlibrc' file as yaml filetype (Wu, Zhenyu) See: https://matplotlib.org/stable/users/explain/customizing.html#the-matplotlibrc-file closes: #14501 Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--runtime/filetype.vim4
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 79a9b481fd..96ecb1aaae 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -425,8 +425,8 @@ au BufNewFile,BufRead .clang-format setf yaml
" Clang-tidy
au BufNewFile,BufRead .clang-tidy setf yaml
-" Matplotlib style
-au BufNewFile,BufRead *.mplstyle setf yaml
+" Matplotlib
+au BufNewFile,BufRead *.mplstyle,matplotlibrc 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 25f3224b7f..3d513907c0 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -836,7 +836,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', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle', 'yarn.lock'],
+ yaml: ['file.yaml', 'file.yml', 'file.eyaml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle', 'matplotlibrc', 'yarn.lock'],
yang: ['file.yang'],
yuck: ['file.yuck'],
z8a: ['file.z8a'],
diff --git a/src/version.c b/src/version.c
index 0d48833a31..8b23724020 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 */
/**/
+ 317,
+/**/
316,
/**/
315,