aboutsummaryrefslogtreecommitdiff
path: root/files/.vimrc
diff options
context:
space:
mode:
authorAnton Bobov <abobov@gmail.com>2014-07-11 16:40:01 +0600
committerAnton Bobov <abobov@gmail.com>2014-07-17 11:50:54 +0600
commit88001dc5ce991f1cf265f00e46381995baf5c4b7 (patch)
tree5b5435705f44531448ce384d22ac0b5d508e7fdb /files/.vimrc
parente98be918ad1c03d1fd6d535863d1e89cfd0f6f8c (diff)
Vimrc update.
Diffstat (limited to 'files/.vimrc')
-rw-r--r--files/.vimrc16
1 files changed, 13 insertions, 3 deletions
diff --git a/files/.vimrc b/files/.vimrc
index b5a20fc..4ac857f 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -83,7 +83,6 @@ set cursorline
set ttyfast
set autoindent
-set copyindent
set smartindent
set splitright
@@ -187,8 +186,6 @@ if has('autocmd')
autocmd FileType java setlocal omnifunc=javacomplete#Complete
autocmd FileType python set expandtab
autocmd FileType html,xml,ant set nolist
- " Автоматически устанавливать директорию файла как текущую
- autocmd BufEnter * execute ":silent! lcd " . expand("%:p:h")
au BufReadPost * if line("'\.") > 0 && line("'\.") <= line("$") | exe 'normal g`.zvzz' | endif
au BufRead,BufNewFile /etc/nginx/* if &ft == "" | setfiletype nginx | endif
@@ -199,6 +196,7 @@ endif
nnoremap ; :
inoremap jj <ESC>
nnoremap <Tab> %
+vnoremap <Tab> %
nnoremap H ^
nnoremap L g_
@@ -206,6 +204,7 @@ nnoremap J mzJ`z
nnoremap <Leader>n :setlocal number!<cr>
nnoremap <Leader>s :setlocal spell!<cr>
+nnoremap <Leader>w :setlocal wrap!<cr>
nnoremap <Leader>p :silent! set paste<CR>"*p:set nopaste<CR>
vnoremap <Leader>y "*y
@@ -237,6 +236,7 @@ nnoremap <C-y> 3<C-y>
" Двигать блоки
vnoremap < <gv
vnoremap > >gv
+nnoremap <Leader>V V`]
" Wrapped lines navigation {{{
@@ -292,6 +292,16 @@ augroup END
" }}}
+" Javascript {{{
+
+augroup ft_javascript
+ au!
+
+ au FileType javascript setlocal foldmethod=marker foldmarker={,}
+augroup END
+
+" }}}
+
" }}}
" Plugins {{{
" Surround {{{