vim: use tabs in PKGBUILD snippet

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 18cfd6ce5a0eb7030579c7fee7d2c0189e267840..4fee43023a390b29772065b07fac7330503f4858 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -428,7 +428,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 
 nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 
 nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>

-nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
+nnoremap <silent> <leader>gc :Gcommit -v<CR>

 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 


@@ -517,21 +517,30 @@ call unite#custom#profile('default', 'context', {
             \ 'direction': 'botright'
             \ })
 
             \ 'direction': 'botright'
             \ })
 

+nnoremap [unite] <Nop>
+nmap <leader>u [unite]
+
+" unite-grep {{{3

 " seems not respected
 let g:unite_source_grep_max_candidates = 2000
 if executable('ag')
 " seems not respected
 let g:unite_source_grep_max_candidates = 2000
 if executable('ag')

-    " Use ag in unite rec source
-    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'

     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'
     let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
     let g:unite_source_grep_recursive_opt = ''
 end
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'
     let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
     let g:unite_source_grep_recursive_opt = ''
 end

+nnoremap <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>

 
 

-nnoremap [unite] <Nop>
-nmap <leader>u [unite]
+" unite-file_rec {{{3
+if executable('ag')
+    " Use ag in unite rec source
+    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
+end

 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>

-nnoremap <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>
+
+" unite-buffer {{{3
+call unite#custom#default_action('buffer', 'goto')
+nnoremap <silent> [unite]b :<C-u>Unite buffer<CR>

 
 " yankring {{{2
 nnoremap <silent> <leader>p :YRShow<cr>
 
 " yankring {{{2
 nnoremap <silent> <leader>p :YRShow<cr>