summaryrefslogtreecommitdiff
path: root/contrib/vim
diff options
context:
space:
mode:
authorGena Makhomed <gmm@csdoc.com>2018-02-01 11:09:35 +0200
committerGena Makhomed <gmm@csdoc.com>2018-02-01 11:09:35 +0200
commitb0f53dd0ebf67d4152ca2e1a2496519d4c16144b (patch)
treec77bf353683512edaff3e519938d40751644ed5d /contrib/vim
parentc8f46e070ff78948b1aeec010c6863ddbc666f65 (diff)
downloadnginx-b0f53dd0ebf67d4152ca2e1a2496519d4c16144b.tar.gz
Contrib: vim syntax, update core module directives.
"match" is block directive, "upstream_conf" is deprecated by patch http://hg.nginx.org/nginx.org/rev/27c53e1cb4b6
Diffstat (limited to 'contrib/vim')
-rw-r--r--contrib/vim/syntax/nginx.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index 13a976931..766bcce28 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -87,6 +87,7 @@ syn keyword ngxDirectiveBlock contained if
syn keyword ngxDirectiveBlock contained geo
syn keyword ngxDirectiveBlock contained map
syn keyword ngxDirectiveBlock contained split_clients
+syn keyword ngxDirectiveBlock contained match
syn keyword ngxDirectiveImportant contained include
syn keyword ngxDirectiveImportant contained root
@@ -117,6 +118,7 @@ syn keyword ngxDirectiveDeprecated contained spdy_pool_size
syn keyword ngxDirectiveDeprecated contained spdy_recv_buffer_size
syn keyword ngxDirectiveDeprecated contained spdy_recv_timeout
syn keyword ngxDirectiveDeprecated contained spdy_streams_index_size
+syn keyword ngxDirectiveDeprecated contained upstream_conf
syn keyword ngxDirective contained absolute_redirect
syn keyword ngxDirective contained accept_mutex
@@ -324,7 +326,6 @@ syn keyword ngxDirective contained log_not_found
syn keyword ngxDirective contained log_subrequest
syn keyword ngxDirective contained map_hash_bucket_size
syn keyword ngxDirective contained map_hash_max_size
-syn keyword ngxDirective contained match
syn keyword ngxDirective contained master_process
syn keyword ngxDirective contained max_ranges
syn keyword ngxDirective contained memcached_bind
@@ -582,7 +583,6 @@ syn keyword ngxDirective contained types_hash_bucket_size
syn keyword ngxDirective contained types_hash_max_size
syn keyword ngxDirective contained underscores_in_headers
syn keyword ngxDirective contained uninitialized_variable_warn
-syn keyword ngxDirective contained upstream_conf
syn keyword ngxDirective contained use
syn keyword ngxDirective contained user
syn keyword ngxDirective contained userid