vim: cpp files can have a textwidth of 100

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 44ddd705b3f6c5436eb93d4db1ed7bf187d6db3f..de47d4c21ec708805846df7acac2beae50856782 100644 (file)
--- 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 '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
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp


@@ -326,7 +328,7 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 
 " bindings {{{1
 
 
 " bindings {{{1
 

-" allow both <space> and / to be <leader>
+" allow both <space> and \ to be <leader>

 map <space> <leader>
 
 " make
 map <space> <leader>
 
 " make


@@ -466,7 +468,7 @@ nnoremap [oe :set expandtab<CR>
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)
 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
 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] <Nop>
 nmap <leader>u [unite]

+nnoremap [unite]u :UniteResume<CR>

 
 " unite-grep {{{3
 " seems not respected
 
 " unite-grep {{{3
 " seems not respected