vim: separate fswitch settings for C and C++

diff --git a/vim/ftplugin/c.vim b/vim/ftplugin/c.vim
index 9dbf048aff37dad5de82537f0bbef982a396794f..3b54992308536e2f2de3c72f30d0ea6d15adb7be 100644 (file)
--- a/vim/ftplugin/c.vim
+++ b/vim/ftplugin/c.vim
@@ -7,10 +7,6 @@ augroup fswitch
     au BufEnter *.h        let b:fswitchlocs = '.,reg:|include.*|src|'
     au BufEnter *.c        let b:fswitchdst  = 'h'
     au BufEnter *.c        let b:fswitchlocs = 'reg:|source|include/**|'
-    au BufEnter *.hpp      let b:fswitchdst  = 'cpp,cxx,c'
-    au BufEnter *.hpp      let b:fswitchlocs = 'reg:|include.*|src|'
-    au BufEnter *.c(pp|xx) let b:fswitchdst  = 'hpp,h'
-    au BufEnter *.c(pp|xx) let b:fswitchlocs = 'reg:|src|include/**|'
 augroup END
 
 nnoremap <buffer> gd :YcmCompleter GoTo<CR>

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index 5154d621d11e6d1142877707325c2a414981ef7c..1f9deab9152ff78a60de43c8cacc86af7d763293 100644 (file)
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -14,6 +14,18 @@ setlocal cinoptions+=:0  " don't indent case labels
 " Load the doxygen syntax
 let b:load_doxygen_syntax = 1
 
+augroup fswitch_cpp
+    au!
+    au BufEnter *.h   let b:fswitchdst  = 'c,cpp'
+    au BufEnter *.h   let b:fswitchlocs = '.,reg:|include.*|src|'
+    au BufEnter *.hpp let b:fswitchdst  = 'ipp,cpp,c'
+    au BufEnter *.hpp let b:fswitchlocs = '.,reg:|include.*|src|'
+    au BufEnter *.cpp let b:fswitchdst  = 'hpp,h'
+    au BufEnter *.cpp let b:fswitchlocs = '.,reg:|src|include/**|'
+    au BufEnter *.ipp let b:fswitchdst  = 'hpp'
+    au BufEnter *.ipp let b:fswitchlocs = '.'
+augroup END
+
 let g:switch_custom_definitions =
     \ [
     \   ['EXPECT_FALSE', 'EXPECT_TRUE'],