[WIP] Push all of the ultrahaptics changes!

[dotfiles.git] / vim / ftplugin / cpp.vim

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index b98aee201b55bd53a2f4c19841c3539e782f7cd0..82e3170b66070d21d3bdd3917461404886591487 100644 (file)
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -15,18 +15,24 @@ setlocal cinoptions+=:0  " don't indent case labels
 let b:load_doxygen_syntax = 1
 
 augroup fswitch
 let b:load_doxygen_syntax = 1
 
 augroup fswitch

-    au BufEnter *.h let b:fswitchdst  = 'cpp,c'
-    au BufEnter *.h let b:fswitchlocs = 'reg:/include/source/'
+    au BufEnter *.h   let b:fswitchdst  = 'cpp,c'
+    au BufEnter *.h   let b:fswitchlocs = 'reg:|include.*|src|'
+    au BufEnter *.cpp let b:fswitchdst  = 'hpp,h'
+    au BufEnter *.cpp let b:fswitchlocs = 'reg:|src|include/**|'

 augroup END
 
 augroup END
 

+nnoremap <buffer> gd :YcmCompleter GoTo<CR>
+nnoremap <buffer> <C-W>d :vs<CR>:YcmCompleter GoTo<CR>
+

 setlocal foldmethod=syntax
 setlocal foldmethod=syntax

+setlocal foldlevel=99

 " set foldlevel according to number of matches of 'namespace' and 'class' not
 " containing ';'
 " set foldlevel according to number of matches of 'namespace' and 'class' not
 " containing ';'

-function! InitialFoldLevel()
-    let v:errmsg = ""
-    keepjumps keeppatterns silent! 1,/}/s/^\(namespace\|class\) \+[^;]*$//n
-    if v:errmsg == ""
-        let &foldlevel=str2nr(split(v:statusmsg)[0])
-    endif
-endf
-call InitialFoldLevel()
+" function! InitialFoldLevel()
+"     let v:errmsg = ""
+"     keepjumps keeppatterns silent! 1,/}/s/^\(namespace\|class\) \+[^;]*$//n
+"     if v:errmsg == ""
+"         let &foldlevel=str2nr(split(v:statusmsg)[0])
+"     endif
+" endf
+" call InitialFoldLevel()