vimrc: disable goldenview

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 788e3df0ea1cb11737f1575e9ba0e8d2121571bc..5e4a0b42f8051e78dbc507b2545d0a3916847d1f 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -27,7 +27,7 @@ Bundle 'tpope/vim-fugitive'
 Bundle 'tpope/vim-surround'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'valloric/youcompleteme'
-Bundle 'zhaocai/goldenview.vim'
+"Bundle 'zhaocai/goldenview.vim'
 
 Bundle 'ompugao/ros.vim'
 Bundle 'ompugao/ctrlp-ros'
@@ -60,7 +60,7 @@ noremap <Left> <NOP>
 noremap <Right> <NOP>
 
 set nostartofline       " don't  move the cursor to the first non-blank char of a line
-set path=.,**           " current + subdirectory search for :find, :grep:, ...
+set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include
 
 " displaying text {{{1
 set scrolloff=5                 " number of screen lines to show around the cursor
@@ -138,6 +138,9 @@ set splitright                  " a new window is put right of the current one
 
 map <F1> :ls<CR>:b<space>
 
+nmap <C-L> <C-W>w
+nmap <C-H> <C-W>W
+
 " using the mouse {{{1
 set mouse=rnv                   " list of flags for using the mouse
 set ttymouse=xterm              " type of mouse
@@ -262,12 +265,12 @@ let g:airline_right_sep = '◀'
 let g:airline#extensions#tabline#enabled = 1
 
 " GoldenView {{{2
-let g:goldenview__enable_default_mapping = 0
-nmap <silent> <C-N>   <Plug>GoldenViewSplit
-nmap <silent> <C-L>   <Plug>GoldenViewNext
-nmap <silent> <C-H>   <Plug>GoldenViewPrevious
-nmap <silent> <C-M>   <Plug>GoldenViewSwitchMain
-nmap <silent> <C-S-M> <Plug>GoldenViewPrevious
+"let g:goldenview__enable_default_mapping = 0
+"nmap <silent> <C-N>   <Plug>GoldenViewSplit
+"nmap <silent> <C-L>   <Plug>GoldenViewNext
+"nmap <silent> <C-H>   <Plug>GoldenViewPrevious
+"nmap <silent> <C-M>   <Plug>GoldenViewSwitchMain
+"nmap <silent> <C-S-M> <Plug>GoldenViewPrevious
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>