Skip to content

Commit

Permalink
Switch nginx vendor to chr4/nginx.vim, closes #205
Browse files Browse the repository at this point in the history
  • Loading branch information
sheerun committed May 17, 2017
1 parent 9197c69 commit 7dd2e11
Show file tree
Hide file tree
Showing 139 changed files with 233 additions and 2,914 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ If you need full functionality of any plugin, please use it directly with your p
- [mako](https://github.com/sophacles/vim-bundle-mako) (syntax, indent, ftplugin)
- [markdown](https://github.com/plasticboy/vim-markdown) (syntax)
- [mathematica](https://github.com/rsmenon/vim-mathematica) (syntax, ftplugin)
- [nginx](https://github.com/othree/nginx-contrib-vim) (syntax, indent, ftplugin)
- [nginx](https://github.com/chr4/nginx.vim) (syntax, indent, ftplugin)
- [nim](https://github.com/zah/nim.vim) (syntax, compiler, indent)
- [nix](https://github.com/spwhitt/vim-nix) (syntax, ftplugin)
- [objc](https://github.com/b4winckler/vim-objc) (ftplugin, syntax, indent)
Expand Down
2 changes: 1 addition & 1 deletion build
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ PACKS="
mako:sophacles/vim-bundle-mako
markdown:plasticboy/vim-markdown:_SYNTAX
mathematica:rsmenon/vim-mathematica
nginx:othree/nginx-contrib-vim
nginx:chr4/nginx.vim
nim:zah/nim.vim:_BASIC
nix:spwhitt/vim-nix
objc:b4winckler/vim-objc
Expand Down
5 changes: 3 additions & 2 deletions ftdetect/polyglot.vim
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,12 @@ augroup filetypedetect
augroup END

augroup filetypedetect
" nginx:othree/nginx-contrib-vim
" nginx:chr4/nginx.vim
au BufRead,BufNewFile *.nginx set ft=nginx
au BufRead,BufNewFile nginx*.conf set ft=nginx
au BufRead,BufNewFile *nginx.conf set ft=nginx
au BufRead,BufNewFile */etc/nginx/* set ft=nginx
au BufRead,BufNewFile */usr/local/nginx/conf/* set ft=nginx
au BufRead,BufNewFile nginx.conf set ft=nginx
augroup END

augroup filetypedetect
Expand Down
4 changes: 0 additions & 4 deletions ftplugin/nginx.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1

setlocal commentstring=#\ %s

setlocal iskeyword+=.
setlocal iskeyword+=/
setlocal iskeyword+=:

endif
Loading

0 comments on commit 7dd2e11

Please sign in to comment.