patch 8.2.3464: nginx files are not recognized

Problem:    nginx files are not recognized.
Solution:   Add several file patterns. (Chris Aumann, closes #8922)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 90beb03ce899e8c0dd191297bcf89a51888d18d1..c81f5a3ef8ac93b5560debf02d01beeadc22af85 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1143,6 +1143,9 @@ au BufNewFile,BufRead Neomuttrc                   setf neomuttrc
 " Netrc
 au BufNewFile,BufRead .netrc                   setf netrc
 
+" Nginx
+au BufNewFile,BufRead *.nginx,nginx*.conf,*nginx.conf,*/etc/nginx/*,*/usr/local/nginx/conf/*,*/nginx/*.conf                    setf nginx
+
 " Ninja file
 au BufNewFile,BufRead *.ninja                  setf ninja
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index a4d0ff94016b2e7a031e18e88f5d29b0d61d4b7d..3f4209a7635a1f58a18dfc17670cd5082b6a6a2e 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -345,6 +345,7 @@ let s:filename_checks = {
     \ 'nanorc': ['/etc/nanorc', 'file.nanorc', 'any/etc/nanorc'],
     \ 'ncf': ['file.ncf'],
     \ 'netrc': ['.netrc'],
+    \ 'nginx': ['file.nginx', 'nginxfile.conf', 'filenginx.conf', 'any/etc/nginx/file', 'any/usr/local/nginx/conf/file', 'any/nginx/file.conf'],
     \ 'ninja': ['file.ninja'],
     \ 'nqc': ['file.nqc'],
     \ 'nroff': ['file.tr', 'file.nr', 'file.roff', 'file.tmac', 'file.mom', 'tmac.file'],

diff --git a/src/version.c b/src/version.c
index f5b36e14d1f96dc6145f9cf2c648740cc1ccadc1..4e4f4fd158d73bf4de7ae3e8cb441c8bed7e81f7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3464,
 /**/
     3463,
 /**/