X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/65972198795d1f1ff9948e83c74bf52d895b2683..1b34e5bf23e5d5a68632e0d6ab0433472accde7d:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 44ddd70..1674f0f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -69,6 +69,8 @@ Plugin 'ompugao/ctrlp-ros'
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'
+Plugin 'ram-z/vim-clang-format'
+Plugin 'sgeb/vim-diff-fold'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
@@ -206,8 +208,8 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " open folds when jumping to line
 set foldopen+=jump
 
-" save and restore folds
-set viewoptions=cursor          " only save cursor position
+set viewoptions=cursor          " save cursor position
+set viewoptions+=folds          " save folds
 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
@@ -326,7 +328,7 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 
 " bindings {{{1
 
-" allow both <space> and / to be <leader>
+" allow both <space> and \ to be <leader>
 map <space> <leader>
 
 " make
@@ -466,7 +468,7 @@ nnoremap [oe :set expandtab<CR>
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)
-  exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+  exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
 endfor
 
 " toggle auto format of text
@@ -639,6 +641,7 @@ call unite#custom#profile('default', 'context', {
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
+nnoremap [unite]u :UniteResume<CR>
 
 " unite-grep {{{3
 " seems not respected