X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=4e1c4b84fda6dfb702f5ea452b776882602ff139;hp=6e26f27658ec44f1f7adcd30893b421ebf29a947;hb=38e73bd0f8a6b326fb47e4cba06587b03e561a07;hpb=328f2f42404cb5de71e06be1e44ddc1957a89800 diff --git a/.vimrc b/.vimrc index 6e26f27..4e1c4b8 100644 --- a/.vimrc +++ b/.vimrc @@ -28,10 +28,15 @@ se ts=2 se expandtab " And << and >> indent by 2. se sw=2 +" Backspace deletes full tab width at the start of a line. +se smarttab " Allow backspace to delete before start of line. se bs=2 +" Don't jump to the start of the line when using H, L etc. +se nosol + " Show the ruler. se ruler " Show partial commands in the ruler. @@ -102,6 +107,9 @@ se suffixes-=*.o,*.obj " cross-platform. se ssop+=unix,slash +" How often do we need to use ^A/^X on octals? +se nf=hex + " Nuke any pre-existing autocommands. augroup Display autocmd! @@ -467,7 +475,9 @@ se diffopt=filler,iwhite " Expand window when doing a vertical diff. if &diff - let &columns = 164 + if &columns < 161 + let &columns = &columns * 2 + endif endif " Remember that we are opening the quickfix window. @@ -512,6 +522,18 @@ fun! Prep_Signs() if ! exists("b:signright") || ! g:marksigns let b:signright=0 endif + if ! exists("b:signsquareleft") || ! g:marksigns + let b:signsquareleft=0 + endif + if ! exists("b:signsquareright") || ! g:marksigns + let b:signsquareright=0 + endif + if ! exists("b:signbraceleft") || ! g:marksigns + let b:signbraceleft=0 + endif + if ! exists("b:signbraceright") || ! g:marksigns + let b:signbraceright=0 + endif if ! exists("b:signa") || ! g:marksigns let b:signa=0 endif @@ -572,23 +594,27 @@ fun! Highlight_Signs(...) let b:signdash = Place_Sign(1, line("''"), b:signdash, "MarkDash") let b:signquote = Place_Sign(2, line("'\""), b:signquote, "MarkQuote") let b:signcaret = Place_Sign(3, line("'^"), b:signcaret, "MarkCaret") - let b:signless = Place_Sign(4, line("'<"), b:signcaret, "MarkLess") - let b:signgreater = Place_Sign(5, line("'>"), b:signcaret, "MarkGreater") - let b:signleft = Place_Sign(6, line("'["), b:signcaret, "MarkLeft") - let b:signright = Place_Sign(7, line("']"), b:signcaret, "MarkRight") - - let b:signa = Place_Sign(8, line("'a"), b:signa, "Marka") - let b:signb = Place_Sign(9, line("'b"), b:signb, "Markb") - let b:signc = Place_Sign(10, line("'c"), b:signc, "Markc") - let b:signd = Place_Sign(11, line("'d"), b:signd, "Markd") - let b:signe = Place_Sign(12, line("'e"), b:signe, "Marke") - let b:signf = Place_Sign(13, line("'f"), b:signf, "Markf") - let b:signA = Place_Sign(14, line("'A"), b:signA, "MarkA") - let b:signB = Place_Sign(15, line("'B"), b:signB, "MarkB") - let b:signC = Place_Sign(16, line("'C"), b:signC, "MarkC") - let b:signD = Place_Sign(17, line("'D"), b:signD, "MarkD") - let b:signE = Place_Sign(18, line("'E"), b:signE, "MarkE") - let b:signF = Place_Sign(19, line("'F"), b:signF, "MarkF") + let b:signless = Place_Sign(4, line("'<"), b:signless, "MarkLess") + let b:signgreater = Place_Sign(5, line("'>"), b:signgreater, "MarkGreater") + let b:signleft = Place_Sign(6, line("'("), b:signleft, "MarkLeft") + let b:signright = Place_Sign(7, line("')"), b:signright, "MarkRight") + let b:signsquareleft = Place_Sign(8, line("'["), b:signsquareleft, "MarkSquareLeft") + let b:signsquareright = Place_Sign(9, line("']"), b:signsquareright, "MarkSquareRight") + let b:signbraceleft = Place_Sign(10, line("'{"), b:signbraceleft, "MarkBraceLeft") + let b:signbraceright = Place_Sign(11, line("'}"), b:signbraceright, "MarkBraceRight") + + let b:signa = Place_Sign(12, line("'a"), b:signa, "Marka") + let b:signb = Place_Sign(13, line("'b"), b:signb, "Markb") + let b:signc = Place_Sign(15, line("'c"), b:signc, "Markc") + let b:signd = Place_Sign(16, line("'d"), b:signd, "Markd") + let b:signe = Place_Sign(17, line("'e"), b:signe, "Marke") + let b:signf = Place_Sign(18, line("'f"), b:signf, "Markf") + let b:signA = Place_Sign(19, line("'A"), b:signA, "MarkA") + let b:signB = Place_Sign(20, line("'B"), b:signB, "MarkB") + let b:signC = Place_Sign(21, line("'C"), b:signC, "MarkC") + let b:signD = Place_Sign(22, line("'D"), b:signD, "MarkD") + let b:signE = Place_Sign(23, line("'E"), b:signE, "MarkE") + let b:signF = Place_Sign(24, line("'F"), b:signF, "MarkF") endfun " Toggle signs. @@ -605,11 +631,15 @@ fun! Cycle_Signs(resize) sign define MarkDash text=' texthl=MarkSign sign define MarkDot text=* texthl=MarkDot sign define MarkQuote text=" texthl=MarkSign - sign define MarkCaret text=^ texthl=MarkSign + sign define MarkCaret text=^ texthl=MarkDot sign define MarkLess text=< texthl=MarkSign sign define MarkGreater text=> texthl=MarkSign - sign define MarkLeft text=[ texthl=MarkSign - sign define MarkRight text=] texthl=MarkSign + sign define MarkLeft text=( texthl=MarkSign + sign define MarkRight text=) texthl=MarkSign + sign define MarkSquareLeft text=[ texthl=MarkSign + sign define MarkSquareRight text=] texthl=MarkSign + sign define MarkBraceLeft text={ texthl=MarkSign + sign define MarkBraceRight text=} texthl=MarkSign sign define Marka text=a texthl=MarkSign linehl=MarkLine sign define Markb text=b texthl=MarkSign linehl=MarkLine sign define Markc text=c texthl=MarkSign linehl=MarkLine @@ -648,6 +678,11 @@ fun! Cycle_Signs(resize) exe "sign unplace " . (g:firstsign + 17) exe "sign unplace " . (g:firstsign + 18) exe "sign unplace " . (g:firstsign + 19) + exe "sign unplace " . (g:firstsign + 20) + exe "sign unplace " . (g:firstsign + 21) + exe "sign unplace " . (g:firstsign + 22) + exe "sign unplace " . (g:firstsign + 23) + exe "sign unplace " . (g:firstsign + 24) sign undefine MarkDash sign undefine MarkDot @@ -657,6 +692,10 @@ fun! Cycle_Signs(resize) sign undefine MarkGreater sign undefine MarkLeft sign undefine MarkRight + sign undefine MarkSquareLeft + sign undefine MarkSquareRight + sign undefine MarkBraceLeft + sign undefine MarkBraceRight sign undefine Marka sign undefine Markb sign undefine Markc @@ -679,7 +718,20 @@ endfun " Change list mode. fun! Cycle_List() - let basic='tab:\\_,trail:_,extends:<,precedes:>' + " Pretty UTF-8 listchars. + if has('multi_byte') && (&tenc =~? '^u\(tf\|cs\)' || (! strlen(&tenc) && &enc =~? '^u\(tf\|cs\)')) && v:version >= "602" + let basic='tab:»·,trail:…,extends:«,precedes:»' + let eol='eol:¶' + if version >= "700" + let basic=basic . ',nbsp:•' + endif + else + let basic='tab:\\_,trail:_,extends:<,precedes:>' + let eol='eol:$' + if version >= "700" + let basic=basic . ',nbsp:+' + endif + endif call Iain_Vars() let b:iainlist = b:iainlist + 1 if b:iainlist > 2 @@ -691,7 +743,7 @@ fun! Cycle_List() exec "set lcs=" . basic set list else - exec "set lcs=" . basic . ",eol:$" + exec "set lcs=" . basic . "," . eol set list endif endfun