vim: don't let tcomment guess filetypes

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index d652461396ae0d9f6ba5e9d0a1c4c07dae635a21..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 '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 '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'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-endwise'


@@ -601,7 +601,8 @@ let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 " tcomments {{{2
 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'
 
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'


@@ -645,6 +646,8 @@ call unite#custom#profile('default', 'context', {
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
 nnoremap [unite]u :UniteResume<CR>
 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
 
 " unite-grep {{{3
 " seems not respected


@@ -714,6 +717,7 @@ nmap ga <Plug>(EasyAlign)
 let g:gtest#highlight_failing_tests = 0
 
 nnoremap <Leader>tt :GTestRun<CR>
 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
 nnoremap <Leader>tu :GTestRunUnderCursor<CR>
 
 " vim-json {{{2