X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/ae723b37b2a50dc76c9336fba39b1f3826a754dc..c089750bf7a4524584f74246b52de9485f63f95b:/vim/ftplugin/cpp.vim

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index ec68cf2..76b5a55 100644
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -18,7 +18,7 @@ let b:load_doxygen_syntax = 1
 
 augroup fswitch_cpp
     au!
-    au BufEnter *.h   let b:fswitchdst  = 'c,cpp,cc'
+    au BufEnter *.h   let b:fswitchdst  = 'cpp,cc,c'
     au BufEnter *.h   let b:fswitchlocs = '.,reg:|include.*|src|'
     au BufEnter *.hpp let b:fswitchdst  = 'cpp,c'
     au BufEnter *.hpp let b:fswitchlocs = '.,reg:|include.*|src|'
@@ -69,6 +69,11 @@ 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
+setlocal errorformat+=\ %##%n\ %m\ %f
+setlocal errorformat+=%n
+"}}}
 setlocal errorformat+=%f:%l:%c:\ %trror:\ %m
 setlocal errorformat+=%f:%l:%c:\ %tarning:\ %m
 setlocal errorformat+=%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f'
@@ -91,10 +96,6 @@ function! s:Debug(...)
     nnoremap <buffer> <C-S> :Step<CR>
     nnoremap <buffer> <C-N> :Over<CR>
     nnoremap <buffer> <C-F> :Finish<CR>
-    nnoremap <buffer> <C-T> :call TermDebugSendCommand('advance -source '.expand('%').' -line '.line("."))<CR>
-    nnoremap <buffer> <C-S> :Step<CR>
-    nnoremap <buffer> <C-N> :Over<CR>
-    nnoremap <buffer> <C-F> :Finish<CR>
 endfunction
 command! -nargs=* -complete=file -bang Debug call <SID>Debug() | Termdebug<bang> <args>
 command! -nargs=+ -complete=file -bang DebugCommand call <SID>Debug() | TermdebugCommand<bang> <args>