summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugues Hiegel <hugues.hiegel@qosmos.com>2014-12-18 15:59:02 +0100
committerHugues Hiegel <hugues.hiegel@qosmos.com>2014-12-18 15:59:02 +0100
commit755574d1e37e40d2c74d4fd3e5d0cb07d98bf4db (patch)
tree3fa30f5960ceaed7298449cbccad1e098dedb40b
parent882ab357864842f7e61eaeb283611ed4b4470985 (diff)
[map] lightens vim display
- removes foldcolumns by default - maps invfold/invnumber to *all* windows at once - lightens the special gitmerge-regexp
-rw-r--r--vimrc18
1 files changed, 9 insertions, 9 deletions
diff --git a/vimrc b/vimrc
index 5853196..fb166d0 100644
--- a/vimrc
+++ b/vimrc
@@ -115,7 +115,6 @@ noremap <C-h> z2h
"Macros
nmap <F2> :set invet<CR>
-
" folding
set foldmethod=indent
set foldignore=
@@ -127,16 +126,18 @@ augroup Folding
augroup END
set foldminlines=0
-set foldcolumn=5
+set foldcolumn=0
set foldlevel=999
-nmap <F1> /^\(<<<<<<<\\|=======\\|>>>>>>>\)<CR>
-
-nmap <F4> :setlocal invnumber<CR>
+" Quick search for merges
+nmap <F1> /^\(<\{7\}\\|>\{7\}\\|=\{7\}\)<CR>
-nmap <F6> :setlocal foldcolumn-=1<CR>:execute 'setlocal foldlevel='.(&foldcolumn - 2)<CR>
-nmap <F7> :setlocal foldcolumn+=1<CR>:execute 'setlocal foldlevel='.(&foldcolumn - 2)<CR>
+nmap <F4> :windo set invnumber<CR>
+"nmap <F6> :setlocal foldcolumn-=1<CR>:execute 'setlocal foldlevel='.(&foldcolumn - 2)<CR>
+"nmap <F7> :setlocal foldcolumn+=1<CR>:execute 'setlocal foldlevel='.(&foldcolumn - 2)<CR>
+nmap <F6> :windo set foldcolumn-=1<CR>
+nmap <F7> :windo set foldcolumn+=1<CR>
" open all
"nmap <F6> zR
" close all
@@ -145,8 +146,7 @@ nmap <F7> :setlocal foldcolumn+=1<CR>:execute 'setlocal foldlevel='.(&foldcolumn
nmap ; za
" open/close recursive under cursor
"nmap <F7> zA
-
-nmap <F5> :setlocal invfoldenable<CR>
+nmap <F5> :windo set invfoldenable<CR>
"buffer moving
nmap <ESC>h :tabN<CR>