Merging
This commit is contained in:
commit
dd10ec5470
1 changed files with 9 additions and 3 deletions
10
vimrc
10
vimrc
|
|
@ -40,6 +40,8 @@ Bundle 'coderifous/textobj-word-column.vim'
|
||||||
" Bundle 'myusuf3/numbers'
|
" Bundle 'myusuf3/numbers'
|
||||||
" Bundle 'benmills/vimux'
|
" Bundle 'benmills/vimux'
|
||||||
" Bundle 'kikijump/tslime.vim'
|
" Bundle 'kikijump/tslime.vim'
|
||||||
|
Bundle 'lukaszkorecki/workflowish'
|
||||||
|
Bundle 'searchfold.vim'
|
||||||
|
|
||||||
" Snipmate
|
" Snipmate
|
||||||
" Bundle 'MarcWeber/vim-addon-mw-utils'
|
" Bundle 'MarcWeber/vim-addon-mw-utils'
|
||||||
|
|
@ -104,7 +106,7 @@ set smartcase " if we include uppercase, it will be case sensitive
|
||||||
set showmatch " matching brackets
|
set showmatch " matching brackets
|
||||||
set matchtime=2 " blink brackets
|
set matchtime=2 " blink brackets
|
||||||
" turn off highlighting
|
" turn off highlighting
|
||||||
nnoremap <leader><space> :noh<cr>
|
nnoremap <silent><leader><space> :noh<cr>
|
||||||
|
|
||||||
" regex " thanks stevelosh
|
" regex " thanks stevelosh
|
||||||
set magic
|
set magic
|
||||||
|
|
@ -173,7 +175,7 @@ nnoremap <leader>s :SyntasticToggleMode<cr>
|
||||||
" let g:SuperTabDefaultCompletionType="context"
|
" let g:SuperTabDefaultCompletionType="context"
|
||||||
|
|
||||||
" open the current file for edit in Perforce
|
" open the current file for edit in Perforce
|
||||||
nnoremap <leader>4 :! p4 edit %<cr>
|
nnoremap <silent><leader>4 :! p4 edit %<cr>
|
||||||
|
|
||||||
" open vsplit and switch to it
|
" open vsplit and switch to it
|
||||||
nnoremap <leader>v <c-w>v<c-w>l
|
nnoremap <leader>v <c-w>v<c-w>l
|
||||||
|
|
@ -198,3 +200,7 @@ nnoremap <leader>l :ls<cr>:b<space>
|
||||||
|
|
||||||
" Set the max files
|
" Set the max files
|
||||||
let g:ctrlp_max_files = 10000
|
let g:ctrlp_max_files = 10000
|
||||||
|
|
||||||
|
" Workflowish stuff. Search for #todo
|
||||||
|
nnoremap <silent><leader>T :vimgrep /\v^\s*\*+.*#todo.*/i %<cr>:copen<cr>:30wincmd _<cr>
|
||||||
|
nnoremap <silent><leader>TT /\v^\s*\*+.*#todo.*/i<cr>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue