patch 9.0.1467: Jenkinsfiles are not recognized as groovy

Problem:    Jenkinsfiles are not recognized as groovy.
Solution:   Add a pattern for Jenkinsfiles. (closes #12236)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b5262d1e9ed27aa25bad72726f71f724e7eaa0e5..bcf5a5bdb0324e2d22c99939e152e721cc3ad38f 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -845,7 +845,7 @@ au BufNewFile,BufRead *.graphql,*.graphqls,*.gql                    setf graphql
 au BufNewFile,BufRead *.gretl                  setf gretl
 
 " Groovy
-au BufNewFile,BufRead *.gradle,*.groovy                setf groovy
+au BufNewFile,BufRead *.gradle,*.groovy,Jenkinsfile            setf groovy
 
 " GNU Server Pages
 au BufNewFile,BufRead *.gsp                    setf gsp

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 60e4f30880e9a00edef094aa1b88de94eb68b163..007f2bb6dc993f506dc74566ced5dc9f97dd3fc9 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -248,7 +248,7 @@ let s:filename_checks = {
     \ 'grads': ['file.gs'],
     \ 'graphql': ['file.graphql', 'file.graphqls', 'file.gql'],
     \ 'gretl': ['file.gretl'],
-    \ 'groovy': ['file.gradle', 'file.groovy'],
+    \ 'groovy': ['file.gradle', 'file.groovy', 'Jenkinsfile'],
     \ 'group': ['any/etc/group', 'any/etc/group-', 'any/etc/group.edit', 'any/etc/gshadow', 'any/etc/gshadow-', 'any/etc/gshadow.edit', 'any/var/backups/group.bak', 'any/var/backups/gshadow.bak', '/etc/group', '/etc/group-', '/etc/group.edit', '/etc/gshadow', '/etc/gshadow-', '/etc/gshadow.edit', '/var/backups/group.bak', '/var/backups/gshadow.bak'],
     \ 'grub': ['/boot/grub/menu.lst', '/boot/grub/grub.conf', '/etc/grub.conf', 'any/boot/grub/grub.conf', 'any/boot/grub/menu.lst', 'any/etc/grub.conf'],
     \ 'gsp': ['file.gsp'],

diff --git a/src/version.c b/src/version.c
index 595c265cff8f4bce4cb8dc85fcb6ea9cc2aa9bfc..bff52cc4ef5aaede9a74a5785481e8b190c591f4 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 */
+/**/
+    1467,
 /**/
     1466,
 /**/