vim: function alias snippet for cpp

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 2817a017e878e5401533e4ff85647096aab149ae..c3c9e6b118d355820b4c573a63fcdc342f2b7c3e 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -10,7 +10,7 @@ set runtimepath& " reset rtp
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 autocmd!
 
 set runtimepath+=$XDG_DATA_HOME/vim/vundle

-call vundle#rc('$XDG_DATA_HOME/vim')
+call vundle#begin('$XDG_DATA_HOME/vim')

 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 


@@ -74,6 +74,8 @@ Plugin 'rdnetto/ycm-generator'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 

+call vundle#end()
+

 " remove entries first
 set runtimepath -=$HOME/.vim
 set runtimepath -=$HOME/.vim/after
 " remove entries first
 set runtimepath -=$HOME/.vim
 set runtimepath -=$HOME/.vim/after


@@ -211,7 +213,6 @@ set viewoptions=cursor          " only save cursor position
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split

-set diffopt+=iwhite         " ignore white space

 set diffopt+=context:10     " 10 lines context between changes
 
 " reading and writing files {{{2
 set diffopt+=context:10     " 10 lines context between changes
 
 " reading and writing files {{{2


@@ -348,7 +349,7 @@ nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 function! StripWhitespace(line1, line2, ...)  " {{{2
   let s_report = &report
   let &report=0
 function! StripWhitespace(line1, line2, ...)  " {{{2
   let s_report = &report
   let &report=0

-  let pattern = a:0 ? a:1 : '[\\]\@<!\s\+$'
+  let pattern = a:0 ? a:1 : '\s\+$'

   let oldview = winsaveview()
   exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
   if oldview != winsaveview()
   let oldview = winsaveview()
   exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
   if oldview != winsaveview()


@@ -434,6 +435,7 @@ nnoremap zx zMzxzt
 
 map <F1> :ls<CR>:b<space>
 
 
 map <F1> :ls<CR>:b<space>
 

+" move between windows

 nnoremap <C-L> <C-W>w
 nnoremap <C-H> <C-W>W
 
 nnoremap <C-L> <C-W>w
 nnoremap <C-H> <C-W>W
 


@@ -541,6 +543,14 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 

+" close-another-window {{{2
+nnoremap <silent> <C-W>c  <NOP>
+nnoremap <silent> <C-W>cc <C-W>c
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
+nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
+nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
+

 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0


@@ -642,8 +652,8 @@ end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
 
 " unite-buffer {{{3
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
 
 " unite-buffer {{{3

-call unite#custom#default_action('buffer', 'goto')
-nnoremap <silent> [unite]b :<C-u>Unite buffer<CR>
+call unite#custom#default_action('buffer', 'open')
+nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>

 
 " unite-menu {{{3
 let g:unite_source_menu_menus = {}
 
 " unite-menu {{{3
 let g:unite_source_menu_menus = {}