vim/cpp: set ycm bindings in c.vim only, cpp loads that file too

diff --git a/vim/ftplugin/c.vim b/vim/ftplugin/c.vim
index dc06376966351aaa376657abe9fffd60eeb945c6..0dca3bc9eee7563f45af60bd03141e62eaf6f8fb 100644 (file)
--- a/vim/ftplugin/c.vim
+++ b/vim/ftplugin/c.vim
@@ -17,6 +17,7 @@ nnoremap <buffer> <C-W>d :vs<CR>:YcmCompleter GoTo<CR>
 nnoremap <buffer> gD :YcmCompleter GoToReferences<CR>
 
 nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR>
+nnoremap <buffer> <leader>fr :YcmCompleter RefactorRename<space>
 
 " format with =
 call operator#user#define_ex_command('ycmcompleter-format', 'YcmCompleter Format')

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index 12c6443f475fbbd7ea6ef09cf9258e3bbc0343ed..ea6837f7200683f9ed688fbd1ddd67419c1000bb 100644 (file)
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -45,30 +45,6 @@ let g:switch_const_definitions =
 
 nnoremap <buffer> <leader>c :call switch#Switch({'definitions': g:switch_const_definitions})<cr>
 
-" Disable ale as we use ycm
-let b:ale_enabled = 0
-
-nnoremap <buffer> gd :YcmCompleter GoTo<CR>
-nnoremap <buffer> <C-W>d :vs<CR>:YcmCompleter GoTo<CR>
-nnoremap <buffer> gD :YcmCompleter GoToReferences<CR>
-
-nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR>
-nnoremap <buffer> <leader>fr :YcmCompleter RefactorRename<space>
-
-" format with =
-call operator#user#define_ex_command('ycmcompleter-format', 'YcmCompleter Format')
-map <buffer> = <Plug>(operator-ycmcompleter-format)
-vnoremap <buffer> = :YcmCompleter Format<CR>
-" restore = mapping to g=
-nnoremap <buffer>g= =
-vnoremap <buffer>g= =
-
-" hover popup
-let g:ycm_auto_hover = ''
-let b:ycm_hover = { 'command': 'GetDoc', 'syntax': &filetype }
-nmap <buffer> gh <plug>(YCMHover)
-nmap <buffer> gH :YcmCompleter GetDoc<CR>
-
 setlocal errorformat=
 " TODO I don't remember these errorformat or what they match, maybe CMake? {{{
 setlocal errorformat+=\ %##%n\ %m\ %f:%l:%c