patch 9.0.0952: Eclipse preference files are not recognized

Problem:    Eclipse preference files are not recognized.
Solution:   Add a pattern to use "jproperties" for Eclipse preference files.
            (closes #11618)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 2013a8697ed550d9f1ecbf042752f33d4374c6df..0a4be77b228f015ee2e4c15d502a5005b6db3678 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -981,6 +981,8 @@ au BufNewFile,BufRead *.jsp                 setf jsp
 
 " Java Properties resource file (note: doesn't catch font.properties.pl)
 au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_??  setf jproperties
+" Eclipse preference files use Java Properties syntax
+au BufNewFile,BufRead org.eclipse.*.prefs      setf jproperties
 
 " Jess
 au BufNewFile,BufRead *.clp                    setf jess

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d2447361d57e4ef111b4dad55e13c5c10ea26b5c..e0841ae0bf82b8a515bd88333c1cb42e34ed343e 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -286,7 +286,7 @@ let s:filename_checks = {
     \ 'jess': ['file.clp'],
     \ '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'],
+    \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
     \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc', 'file.slnf'],
     \ 'json5': ['file.json5'],
     \ 'jsonc': ['file.jsonc'],

diff --git a/src/version.c b/src/version.c
index 829e71dea731686967f6489deb5976341db1d0c5..758c4b56a33f1d37c1ce8b921c0e9a68497efccf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    952,
 /**/
     951,
 /**/