mirror of
https://github.com/amix/vimrc
synced 2025-07-12 14:15:00 +08:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@ -44,7 +44,7 @@
|
||||
" => General
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" Sets how many lines of history VIM has to remember
|
||||
set history=700
|
||||
set history=500
|
||||
|
||||
" Enable filetype plugins
|
||||
filetype plugin on
|
||||
@ -232,7 +232,7 @@ map <C-l> <C-W>l
|
||||
map <leader>bd :Bclose<cr>
|
||||
|
||||
" Close all the buffers
|
||||
map <leader>ba :1,1000 bd!<cr>
|
||||
map <leader>ba :bufdo bd<cr>
|
||||
|
||||
" Useful mappings for managing tabs
|
||||
map <leader>tn :tabnew<cr>
|
||||
@ -262,12 +262,12 @@ catch
|
||||
endtry
|
||||
|
||||
" Return to last edit position when opening files (You want this!)
|
||||
autocmd BufReadPost *
|
||||
\ if line("'\"") > 0 && line("'\"") <= line("$") |
|
||||
\ exe "normal! g`\"" |
|
||||
\ endif
|
||||
" autocmd BufReadPost *
|
||||
" \ if line("'\"") > 0 && line("'\"") <= line("$") |
|
||||
" \ exe "normal! g`\"" |
|
||||
" \ endif
|
||||
" Remember info about open buffers on close
|
||||
set viminfo^=%
|
||||
" set viminfo^=%
|
||||
|
||||
|
||||
""""""""""""""""""""""""""""""
|
||||
@ -310,21 +310,21 @@ autocmd BufWrite *.coffee :call DeleteTrailingWS()
|
||||
|
||||
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" => Ack searching and cope displaying
|
||||
" requires ack.vim - it's much better than vimgrep/grep
|
||||
" => Ag searching and cope displaying
|
||||
" requires ag.vim - it's much better than vimgrep/grep
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" When you press gv you Ack after the selected text
|
||||
" When you press gv you Ag after the selected text
|
||||
vnoremap <silent> gv :call VisualSelection('gv', '')<CR>
|
||||
|
||||
" Open Ack and put the cursor in the right position
|
||||
map <leader>g :Ack
|
||||
" Open Ag and put the cursor in the right position
|
||||
map <leader>g :Ag
|
||||
|
||||
" When you press <leader>r you can search and replace the selected text
|
||||
vnoremap <silent> <leader>r :call VisualSelection('replace', '')<CR>
|
||||
|
||||
" Do :help cope if you are unsure what cope is. It's super useful!
|
||||
"
|
||||
" When you search with Ack, display your results in cope by doing:
|
||||
" When you search with Ag, display your results in cope by doing:
|
||||
" <leader>cc
|
||||
"
|
||||
" To go to the next search result do:
|
||||
@ -389,7 +389,7 @@ function! VisualSelection(direction, extra_filter) range
|
||||
if a:direction == 'b'
|
||||
execute "normal ?" . l:pattern . "^M"
|
||||
elseif a:direction == 'gv'
|
||||
call CmdLine("Ack \"" . l:pattern . "\" " )
|
||||
call CmdLine("Ag \"" . l:pattern . "\" " )
|
||||
elseif a:direction == 'replace'
|
||||
call CmdLine("%s" . '/'. l:pattern . '/')
|
||||
elseif a:direction == 'f'
|
||||
@ -405,7 +405,7 @@ endfunction
|
||||
function! HasPaste()
|
||||
if &paste
|
||||
return 'PASTE MODE '
|
||||
en
|
||||
endif
|
||||
return ''
|
||||
endfunction
|
||||
|
||||
|
@ -77,7 +77,8 @@ set grepprg=/bin/grep\ -nH
|
||||
" => Nerd Tree
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
let g:NERDTreeWinPos = "right"
|
||||
let NERDTreeIgnore = ['\.pyc$']
|
||||
let NERDTreeShowHidden=0
|
||||
let NERDTreeIgnore = ['\.pyc$', '__pycache__']
|
||||
let g:NERDTreeWinSize=35
|
||||
map <leader>nn :NERDTreeToggle<cr>
|
||||
map <leader>nb :NERDTreeFromBookmark
|
||||
@ -116,3 +117,20 @@ nnoremap <silent> <leader>z :Goyo<cr>
|
||||
" => Syntastic (syntax checker)
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
let g:syntastic_python_checkers=['pyflakes']
|
||||
let g:syntastic_javascript_checkers = ['jshint']
|
||||
|
||||
" Custom CoffeeScript SyntasticCheck
|
||||
func! SyntasticCheckCoffeescript()
|
||||
let l:filename = substitute(expand("%:p"), '\(\w\+\)\.coffee', '.coffee.\1.js', '')
|
||||
execute "e " . l:filename
|
||||
execute "SyntasticCheck"
|
||||
execute "Errors"
|
||||
endfunc
|
||||
nnoremap <silent> <leader>l :call SyntasticCheckCoffeescript()<cr>
|
||||
|
||||
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" => Git gutter (Git diff)
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
let g:gitgutter_enabled=0
|
||||
nnoremap <silent> <leader>d :GitGutterToggle<cr>
|
||||
|
Reference in New Issue
Block a user