andre
/
vim
mirror of https://github.com/akelge/vim
1
0
Fork 0
Code Issues Releases Wiki Activity

Vimdiff keys 

nginx syntax
This commit is contained in:
Andrea Mistrali 2015-12-02 16:25:34 +01:00
parent b3c1538760
commit 17bcec9c53
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vimrc
View File

@ -44,6 +44,7 @@ Plugin 'mkitt/tabline.vim'
" Conf files
Plugin 'robbles/logstash.vim'
Plugin 'sclo/haproxy.vim'
Plugin 'evanmiller/nginx-vim-syntax'
" Snipmate
Plugin 'MarcWeber/vim-addon-mw-utils'
@ -266,6 +267,10 @@ map <silent> <Leader>c <plug>NERDCommenterToggle
inoremap <silent> <C-\> <C-N>
inoremap <silent> <C-Tab> <C-N>
" diffput/diffget
nnoremap <silent> <Leader>dp :diffput<CR>
nnoremap <silent> <Leader>dg :diffget<CR>
" Line/block move up/down
if (has('mac') || has('macunix'))
nnoremap <T-Down> :m .+1<CR>==
@ -355,6 +360,9 @@ if has("autocmd")
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
\ exe "normal g'\"" |
\ endif
" If doing a diff. Upon writing changes to file, automatically update the differences
autocmd BufWritePost * if &diff == 1 | diffupdate | endif
" Mako
autocmd! BufRead,BufNewFile *.mako setfiletype mako
autocmd BufWinEnter *.mako setfiletype mako