vim: don't let tcomment guess filetypes

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index b4d3a3e5642679a7e4b95fbf6f3e0618b4befee1..1a4f288b135af0c69cd695836893123b4469c1c7 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,12 +31,12 @@ Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'
 Plugin 'ram-z/vim-clang-format'
 Plugin 'ram-z/vimwiki'
-Plugin 'rdnetto/ycm-generator'
 Plugin 'scrooloose/syntastic'
 Plugin 'sgeb/vim-diff-fold'
 Plugin 'shougo/unite.vim'
 Plugin 'shougo/vimproc.vim'
 Plugin 'sjl/gundo.vim'
+Plugin 'thinca/vim-qfreplace'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-endwise'
@@ -68,7 +68,6 @@ Plugin 'kana/vim-operator-user'
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
-Plugin 'derekwyatt/vim-protodef'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
@@ -602,7 +601,8 @@ let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 " tcomments {{{2
-let g:tcommentTextObjectInlineComment = 'gic'
+let g:tcomment_textobject_inlinecomment = 'gic'
+let g:tcomment#filetype#guess = 0
 
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
@@ -646,6 +646,8 @@ call unite#custom#profile('default', 'context', {
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
 nnoremap [unite]u :UniteResume<CR>
+nnoremap <silent> [u :UnitePrevious<CR>
+nnoremap <silent> ]u :UniteNext<CR>
 
 " unite-grep {{{3
 " seems not respected
@@ -657,6 +659,7 @@ if executable('ag')
     let g:unite_source_grep_recursive_opt = ''
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
+nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
 command! -nargs=1 Ag Unite grep:.::<args>
 
 " unite-file_rec {{{3
@@ -714,6 +717,7 @@ nmap ga <Plug>(EasyAlign)
 let g:gtest#highlight_failing_tests = 0
 
 nnoremap <Leader>tt :GTestRun<CR>
+nnoremap <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
 nnoremap <Leader>tu :GTestRunUnderCursor<CR>
 
 " vim-json {{{2
@@ -839,8 +843,8 @@ function! FindGitDirOrHome()
   endif
 endfunction
 command! Cd cd %:h
-command! Cr execute('cd ' . FindGitDirOrHome())
+command! Cdr execute('cd ' . FindGitDirOrHome())
 command! LCd lcd %:h
-command! LCr execute('lcd ' . FindGitDirOrHome())
+command! LCdr execute('lcd ' . FindGitDirOrHome())
 
 " vim:set et sw=2 ts=2 tw=78: