summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Aumann <me@chr4.org>2021-10-03 11:46:09 +0100
committerBram Moolenaar <Bram@vim.org>2021-10-03 11:46:09 +0100
commit8b8c0ed657fabd88e610401ca8a12366f987db94 (patch)
tree661f7c169292542824c304236df4eca9a027195c
parent72d2fa69e56dd0e61eac87a9c3b79cd89d47cdd9 (diff)
downloadvim-git-8b8c0ed657fabd88e610401ca8a12366f987db94.tar.gz
patch 8.2.3464: nginx files are not recognizedv8.2.3464
Problem: nginx files are not recognized. Solution: Add several file patterns. (Chris Aumann, closes #8922)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 90beb03ce..c81f5a3ef 100644
--- 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 a4d0ff940..3f4209a76 100644
--- 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 f5b36e14d..4e4f4fd15 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3464,
+/**/
3463,
/**/
3462,