vim: setup fswitch

diff --git a/vim/ftplugin/roscpp.vim b/vim/ftplugin/roscpp.vim
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c43b32e86697df6b3ff351dbc0057da927bfbb7f 100644 (file)
--- a/vim/ftplugin/roscpp.vim
+++ b/vim/ftplugin/roscpp.vim
@@ -0,0 +1,9 @@
+augroup fs_roscpp
+    autocmd!
+    autocmd BufEnter *.cpp let b:fswitchdst  = 'h'
+    autocmd BufEnter *.cpp let b:fswitchlocs = 'reg:|src$|include/**|'
+    autocmd BufEnter *.h   let b:fswitchdst  = 'cpp'
+    autocmd BufEnter *.h   let b:fswitchlocs = 'reg:/include.*/src/'
+augroup END
+
+set makeprg=catkin_make\ -C$ROS_WORKSPACE

diff --git a/vim/vimrc b/vim/vimrc
index 23e9b8af20b489dab52a56fb59e7d43f5526ab91..caa3348aebd7bfa82de166a35bdcea80c4d81e8b 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -400,6 +400,13 @@ let g:checkattach_filebrowser = 'ranger'
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 

+" fswitch {{{2
+nnoremap <silent> <Leader>ff :FSHere<CR>
+nnoremap <silent> <Leader>fl :FSRight<CR>
+nnoremap <silent> <Leader>fh :FSLeft<CR>
+nnoremap <silent> <Leader>fL :FSSplitRight<CR>
+nnoremap <silent> <Leader>fH :FSSplitLeft<CR>
+

 " fugitive {{{2
 nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>
 " delete fugitive buffers when closed
 " fugitive {{{2
 nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>
 " delete fugitive buffers when closed

diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py
index ba188217009cb151d2f7e952378053eb66934c10..74d7b8ec7fc75a8b73bf12b1b4ad2a25c839951d 100644 (file)
--- a/vim/ycm_extra_conf.py
+++ b/vim/ycm_extra_conf.py
@@ -31,7 +31,6 @@ def FlagsForFile( filename, **kwargs ):
   flags += rospack()
   relative_to = cwd
   final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
   flags += rospack()
   relative_to = cwd
   final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )

-  print flags

 
   return {
     'flags': final_flags,
 
   return {
     'flags': final_flags,