patch 8.2.3880: Solution filter files are not recognized

Problem:    Solution filter files are not recognized.
Solution:   Add pattern *.slnf and use json. (Doug Kearns)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bd1d2e90570f5eab005dc2c56813336a77f257b6..c3d370d4eb96075effcce674981e78ef916d73ec 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1750,6 +1750,7 @@ au BufNewFile,BufRead *.ice                       setf slice
 
 " Microsoft Visual Studio Solution
 au BufNewFile,BufRead *.sln                    setf solution
+au BufNewFile,BufRead *.slnf                   setf json
 
 " Spice
 au BufNewFile,BufRead *.sp,*.spice             setf spice

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 719d690e8ee89ca8ce2e3762a4998c42b1788a3c..8fb7d92947b4c25227950df58a565972fc8d470e 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -263,7 +263,7 @@ let s:filename_checks = {
     \ 'jgraph': ['file.jgr'],
     \ 'jovial': ['file.jov', 'file.j73', 'file.jovial'],
     \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file'],
-    \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc'],
+    \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc', 'file.slnf'],
     \ 'jsonc': ['file.jsonc'],
     \ 'jsp': ['file.jsp'],
     \ 'julia': ['file.jl'],

diff --git a/src/version.c b/src/version.c
index 20c78d71bef2e513ee714cb35fba8ef371cd08eb..6b4708d8072cdd6078e64a3412fa7dbe9442d32a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3880,
 /**/
     3879,
 /**/