From: Iain Patterson Date: Thu, 9 Jul 2009 10:31:38 +0000 (+0100) Subject: Various vim fixes. X-Git-Url: http://git.iain.cx/?p=profile.git;a=commitdiff_plain;h=c204dd8c0a7d9d0c767e01f98f623af5f103c4d9;hp=c47cae3b332824ba5432e70f0d04ba82e2ff71f9 Various vim fixes. Change some mappings which conflict with plugins. Unicode in Show_List(). When a new buffer was created BufEnter called Highlight_Signs() which called Uncluttered_Buffer(). Most of the tests in that function don't apply until the buffer is completely set up so move the initial call to Highlight_Signs() to BufReadPost. Show version in verbose statusline. Added Extra_Columns() function to determine if column resizing is necessary. Use it after setting listchars. Fold up functions. Use Prep_Sign() to shorten Prep_Signs(). Use Prep_Var() to shorten Iain_Vars(). --- diff --git a/.vimrc b/.vimrc index f16235a..b63d1ba 100644 --- a/.vimrc +++ b/.vimrc @@ -1,5 +1,5 @@ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Multi-version vimrc compatible with version 4 and above. +" Multi-version vimrc compatible with version 4 and above. vim:set fdm=marker: """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Note that "if | call Something() | endif" syntax is unsupported @@ -14,6 +14,7 @@ version 4.0 " "if version" syntax used later in this file so we don't use it. No attempt " is made to make this configuration compatible with Vim 3. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +"{{{1 " No compatibility mode. se nocp @@ -77,11 +78,12 @@ inoremap " Swap jump keys. noremap ' ` noremap ` ' +"}}}1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 5 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -if version >= "500" +if version >= "500" "{{{1 version 5.0 " Tell Vim we use dark backgrounds in our terminals. @@ -155,78 +157,81 @@ command! W :w command! Wq :wq command! Wqa :wqa -" Set up our variables. -fun! Iain_Vars() - if ! exists("b:iainlist") - let b:iainlist = 0 - endif - if ! exists("b:iainhex") - let b:iainhex = 0 - endif - if ! exists("b:iainverbose") - let b:iainverbose = 0 - endif - if ! exists("b:iainstatus") - " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old. - let b:iainstatus = "Fih" - endif - if ! exists("g:iainextracolumns") - let g:iainextracolumns = 0 +" Helper to initialise a variable. +fun! Prep_Var(var, value) "{{{2 + if exists(a:var) + return endif + exe "let " . a:var . "=" . a:value +endfun "}}}2 + +" Set up our variables. +fun! Iain_Vars() "{{{2 + call Prep_Var("b:iainlist", 0) + call Prep_Var("b:iainhex", 0) + call Prep_Var("b:iainverbose", 0) + " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old. + call Prep_Var("b:iainstatus", "'Fih'") + call Prep_Var("g:iainextracolumnsnumber", 0) + call Prep_Var("g:iainextracolumnslist", 0) if has("signs") - if ! exists("g:marksigns") - let g:marksigns = 0 - endif - if ! exists("g:firstsign") - let g:firstsign = 100 - endif + call Prep_Var("g:marksigns", 0) + call Prep_Var("g:firstsign", 100) endif -endfun +endfun "}}}2 " Helper for status line. " Show space, underscore or dollar sign depending on list mode. -fun! Show_List() +fun! Show_List() "{{{2 call Iain_Vars() if b:iainlist == 0 " No list. return " " - elseif b:iainlist == 1 - " Just tabs. - return "_" + elseif Has_Unicode() + if b:iainlist == 1 + " Just tabs. + return "»" + else + " Full list. + return "¶" + endif else - " Full list. - return "\$" + if b:iainlist == 1 + return "_" + else + return "\$" + endif endif -endfun +endfun "}}}2 " Helper for status line. " Show c or C to denote case-sensitivity. -fun! Show_Case() +fun! Show_Case() "{{{2 if &ic return "c" else return "C" endif -endfun +endfun "}}}2 " Helper for status line. " Show the size of the tabstop. -fun! Show_Tabstop() +fun! Show_Tabstop() "{{{2 return &ts -endfun +endfun "}}}2 " Helper for status line. " Show p when paste mode is on. -fun! Show_Paste() +fun! Show_Paste() "{{{2 if &paste return "p" else return "" endif -endfun +endfun "}}}2 " Show the window title. -fun! Show_TitleString() +fun! Show_TitleString() "{{{2 if bufname("") == "" let l:ts1='Vim' else @@ -242,32 +247,38 @@ fun! Show_TitleString() let l:ts1=l:ts1 . " " . v:servername endif return l:ts1 -endfun +endfun "}}}2 " Show the status line. -fun! Show_StatusLine() +fun! Show_StatusLine() "{{{2 call Iain_Vars() - let l:sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=' + let l:sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ ' let l:sl3='L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P' let l:hexformat='%b' if b:iainhex let l:hexformat='0\x%02B' endif if b:iainverbose + let l:sl1=l:sl1 . v:version . '\ %=' let l:sl2=l:hexformat . '\ \|\ P:%4.6o\ ' else + let l:sl1=l:sl1 . '%=' let l:sl2='' endif exec "set statusline=" . l:sl1 . l:sl2 . l:sl3 -endfun +endfun "}}}2 " Toggle case-sensitivity. -fun! Invert_Case() +fun! Invert_Case() "{{{2 let &ic = ! &ic -endfun +endfun "}}}2 " Grow or shrink the window size. -fun! Resize_Columns(op, ...) +fun! Resize_Columns(op, ...) "{{{2 + if a:op == "" + return + endif + if a:0 == 0 " Vim 5 hardcodes the size of numbers column to 8. if version >= "700" @@ -294,36 +305,61 @@ fun! Resize_Columns(op, ...) endif exe l:resize -endfun +endfun "}}}2 + +" Set extra columns depending on window status. +fun! Extra_Columns(extra, var, ...) "{{{2 + if v:version < "700" + return "" + endif + + call Iain_Vars() + + if a:0 == 0 + let l:condition = "" + else + let l:condition = a:1 + endif + + let l:i = 1 + let l:num_windows = 0 + while l:i <= winnr("$") + let l:val = 0 + exe "if getwinvar(" . l:i . ", '" . a:var . "') " . l:condition . " | let l:val = 1 | endif" + if l:val + let l:num_windows = l:num_windows + 1 + endif + let l:i = l:i + 1 + endwhile + + let l:extra = "g:iainextracolumns" . a:extra + exe "let l:val = " . l:extra + + if l:num_windows == l:val + return "" + endif + exe "let " . l:extra . " = " . l:num_windows + + if l:num_windows == 0 + return "-" + elseif l:val == 0 + return "+" + endif +endfun "}}}2 " Toggle number display. -fun! Number(resize) +fun! Number(resize) "{{{2 call Iain_Vars() let &number = ! &number - if version >= "700" - let l:i = 0 - let l:num_numbers = 0 - while l:i <= winnr("$") - if getwinvar(l:i, "&number") == 1 - let l:num_numbers = l:num_numbers + 1 - endif - let l:i = l:i + 1 - endwhile + " Ensure we keep track of any extra columns even if we aren't resizing. + " This prevents confusion when number is set at startup. + let l:extra = Extra_Columns("number", "&number") - if l:num_numbers == 0 - let g:iainextracolumns = 0 - if a:resize - call Resize_Columns("-") - endif - elseif g:iainextracolumns == 0 - let g:iainextracolumns = 1 - if a:resize - call Resize_Columns("+") - endif - endif + if a:resize + call Resize_Columns(l:extra) endif -endfun +endfun "}}}2 " Restore window size. au Display VimLeave * if exists("g:oldcols") | call Resize_Columns("-", (&columns - g:oldcols)) | endif @@ -333,32 +369,32 @@ au Mode BufEnter * if &ft == "make" | call MakeMode_map() | endif au Mode BufLeave * if &ft == "make" | call MakeMode_unmap() | endif " Entering Make mode. -fun! MakeMode_map() - call Iain_Vars() +fun! MakeMode_map() "{{{2 + call Iain_Vars() let b:iainlist=1 call Cycle_List() set ts=8 set noexpandtab -endfun +endfun "}}}2 " Leaving Make mode. -fun! MakeMode_unmap() +fun! MakeMode_unmap() "{{{2 call Cycle_List() set ts=2 set expandtab -endfun +endfun "}}}2 " Show the status line for the first time. call Show_StatusLine() " Function to create mappings with either a hardcoded \ or . -fun! Mapping(keysequence,mapping) +fun! Mapping(keysequence,mapping) "{{{2 if version < "600" exec "map \\" . a:keysequence . " " . a:mapping else exec "map " . a:keysequence . " " . a:mapping endif -endfun +endfun "}}}2 " Use - and = to create underlines. call Mapping("-", "yyp:s/./-/g:let @/='':") @@ -377,7 +413,7 @@ call Mapping("3", ":se ts=32:") " Toggle paste mode with \p. call Mapping("p", ":se paste!:") " Swap case-sensitivity with \c. -call Mapping("c", ":call Invert_Case():") +call Mapping("C", ":call Invert_Case():") " Change number mode with \n. call Mapping("n", ":call Number(1):") " Expand or shrink window size with \> and \<. @@ -392,7 +428,7 @@ map Q " Vim tip 99: What's the highlighting group under the cursor? call Mapping("h", ":echo \"hi<\" . synIDattr(synID(line(\".\"),col(\".\"),1),\"name\") . '> trans<' . synIDattr(synID(line(\".\"),col(\".\"),0),\"name\") . \"> lo<\" . synIDattr(synIDtrans(synID(line(\".\"),col(\".\"),1)),\"name\") . \">\"") -fun! Uncluttered_Buffer() +fun! Uncluttered_Buffer() "{{{2 if exists("uncluttered_buffer") if uncluttered_buffer == 1 return 1 @@ -418,9 +454,9 @@ fun! Uncluttered_Buffer() endif return 0 -endfun +endfun "}}}2 -fun! Startup_Resize() +fun! Startup_Resize() "{{{2 let l:columns = 0 " Resize for numbers. @@ -444,19 +480,19 @@ fun! Startup_Resize() if g:oldcols < (80 + l:columns) call Resize_Columns("+", l:columns) endif -endfun +endfun "}}}2 " Show numbers by default. au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif " Position the compview plugin window. au Display BufEnter -SearchResults- set buftype=nowrite | set nonumber | wincmd J -endif +endif "}}}1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 6 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -if version >= "600" +if version >= "600" "{{{1 version 6.0 if has("win32") @@ -513,86 +549,45 @@ vnoremap # y?\V=substitute(escape(@@,"?\\"),"\n","\\\\n","ge") " Set mark and update highlighting. if has("signs") - au Signs BufEnter * call Highlight_Signs() + au Signs BufReadPost * call Highlight_Signs() au Signs CursorHold * call Highlight_Signs() endif -fun! Prep_Signs() - if ! exists("b:signdot") || ! g:marksigns - let b:signdot=0 - endif - if ! exists("b:signdash") || ! g:marksigns - let b:signdash=0 - endif - if ! exists("b:signquote") || ! g:marksigns - let b:signquote=0 - endif - if ! exists("b:signcaret") || ! g:marksigns - let b:signcaret=0 - endif - if ! exists("b:signless") || ! g:marksigns - let b:signless=0 - endif - if ! exists("b:signgreater") || ! g:marksigns - let b:signgreater=0 - endif - if ! exists("b:signleft") || ! g:marksigns - let b:signleft=0 - endif - 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 - if ! exists("b:signb") || ! g:marksigns - let b:signb=0 - endif - if ! exists("b:signc") || ! g:marksigns - let b:signc=0 - endif - if ! exists("b:signd") || ! g:marksigns - let b:signd=0 - endif - if ! exists("b:signe") || ! g:marksigns - let b:signe=0 - endif - if ! exists("b:signf") || ! g:marksigns - let b:signf=0 - endif - if ! exists("b:signA") || ! g:marksigns - let b:signA=0 - endif - if ! exists("b:signB") || ! g:marksigns - let b:signB=0 - endif - if ! exists("b:signC") || ! g:marksigns - let b:signC=0 - endif - if ! exists("b:signD") || ! g:marksigns - let b:signD=0 - endif - if ! exists("b:signE") || ! g:marksigns - let b:signE=0 - endif - if ! exists("b:signF") || ! g:marksigns - let b:signF=0 - endif -endfun! - -fun! Place_Sign(number, line, old, name) +" Helper to set buffer variable for a given sign. +fun! Prep_Sign(sign) "{{{2 + if ! exists("b:sign" . a:sign) || ! g:marksigns + exe "let b:sign" . a:sign . "=0" + endif +endfun "}}}2 + +fun! Prep_Signs() "{{{2 + call Prep_Sign("dot") + call Prep_Sign("dash") + call Prep_Sign("quote") + call Prep_Sign("caret") + call Prep_Sign("less") + call Prep_Sign("greater") + call Prep_Sign("left") + call Prep_Sign("right") + call Prep_Sign("squareleft") + call Prep_Sign("squareright") + call Prep_Sign("braceleft") + call Prep_Sign("braceright") + call Prep_Sign("a") + call Prep_Sign("b") + call Prep_Sign("c") + call Prep_Sign("d") + call Prep_Sign("e") + call Prep_Sign("f") + call Prep_Sign("A") + call Prep_Sign("B") + call Prep_Sign("C") + call Prep_Sign("D") + call Prep_Sign("E") + call Prep_Sign("F") +endfun! "}}}2 + +fun! Place_Sign(number, line, old, name) "{{{2 if a:line == a:old return a:old endif @@ -601,9 +596,9 @@ fun! Place_Sign(number, line, old, name) " Don't place the sign if it would conflict with the last change sign. exe "sign place " . (g:firstsign + a:number) . " line=" . a:line . " name=" . a:name . " buffer=" . bufnr("") return a:line -endfun +endfun "}}}2 -fun! Highlight_Signs(...) +fun! Highlight_Signs(...) "{{{2 if ! has("signs") || ! g:marksigns || Uncluttered_Buffer() return endif @@ -635,10 +630,10 @@ fun! Highlight_Signs(...) 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 +endfun "}}}2 " Toggle signs. -fun! Cycle_Signs(resize) +fun! Cycle_Signs(resize) "{{{2 if ! has("signs") return endif @@ -740,9 +735,10 @@ fun! Cycle_Signs(resize) call Resize_Columns("-", 2) endif endif -endfun +endfun "}}}2 -fun! Has_Unicode() +" Do we have Unicode? +fun! Has_Unicode() "{{{2 if ! has('multi_byte') return 0 endif @@ -760,10 +756,10 @@ fun! Has_Unicode() endif return 0 -endfun +endfun "}}}2 " Change list mode. -fun! Cycle_List() +fun! Cycle_List() "{{{2 " Pretty UTF-8 listchars. if Has_Unicode() let basic='tab:»·,trail:…,extends:«,precedes:»' @@ -781,49 +777,49 @@ fun! Cycle_List() call Iain_Vars() let b:iainlist = b:iainlist + 1 if b:iainlist > 2 - call Resize_Columns("-", 1) let b:iainlist = 0 endif if b:iainlist == 0 - set nolist + setlocal nolist elseif b:iainlist == 1 - exec "set lcs=" . basic - set list + exec "setlocal lcs=" . basic + setlocal list else - call Resize_Columns("+", 1) - exec "set lcs=" . basic . "," . eol - set list + exec "setlocal lcs=" . basic . "," . eol + setlocal list endif -endfun + + call Resize_Columns(Extra_Columns("list", "&lcs", " =~# 'eol'"), 1) +endfun "}}}2 " Cycle between hex and decimal display of toolbar stuff. -fun! Cycle_HexStatusLine() +fun! Cycle_HexStatusLine() "{{{2 call Iain_Vars() let b:iainhex = ! b:iainhex call Show_StatusLine() -endfun +endfun "}}}2 " Cycle verbose display of toolbar stuff. -fun! Cycle_VerboseStatusLine() +fun! Cycle_VerboseStatusLine() "{{{2 call Iain_Vars() let b:iainverbose = ! b:iainverbose call Show_StatusLine() -endfun +endfun "}}}2 " Toggle quickfix window. -fun! Cycle_Quickfix() +fun! Cycle_Quickfix() "{{{2 if g:quickfixing == 1 cclose let g:quickfixing=0 else copen endif -endfun +endfun "}}}2 " Swap hex/decimal statusline with \x. call Mapping("x", ":call Cycle_HexStatusLine():") " Change statusline verbosity with \v. -call Mapping("v", ":call Cycle_VerboseStatusLine():") +call Mapping("V", ":call Cycle_VerboseStatusLine():") " Cycle list styles with \l. call Mapping("l", ":call Cycle_List():") " Toggle tags with \t. @@ -834,11 +830,11 @@ call Mapping("f", ":se foldenable!:") call Mapping("q", ":call Cycle_Quickfix():") " Rerun filetype detection with \s. The s is for syntax, as this will be " updated as a side-effect. -call Mapping("s", ":filetype detect:") +call Mapping("S", ":filetype detect:") " Toggle marks with \m. call Mapping("m", ":call Cycle_Signs(1):") -fun! Iain_Colour(colour) +fun! Iain_Colour(colour) "{{{2 if &t_Co == 88 if a:colour == "darkblue" return 17 @@ -862,13 +858,13 @@ fun! Iain_Colour(colour) else return a:colour endif -endfun +endfun "}}}2 " Change status bar colour when various things happen. " Flags: H/h: Cursor held/moved. " F/f: Focus gained/lost. " I/i: Insert mode entered/left. -fun! Highlight_StatusLine(flag) +fun! Highlight_StatusLine(flag) "{{{2 " Get current status. call Iain_Vars() @@ -910,22 +906,22 @@ fun! Highlight_StatusLine(flag) let l:termcolour = Iain_Colour(l:colour) exec "highlight StatusLine gui=bold term=bold cterm=bold guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour -endfun +endfun "}}}2 au Display VimEnter * call Highlight_StatusLine("") " Show signs by default. au Display VimEnter * call Cycle_Signs(0) -endif +endif "}}}1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 7 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -if version >= "700" +if version >= "700" "{{{1 version 7.0 " Helper to show tab name. -fun! TabName(label, gui) +fun! TabName(label, gui) "{{{2 let l:label = a:label if l:label == "" let l:label = "No Name" @@ -939,10 +935,10 @@ fun! TabName(label, gui) endif endif return l:label -endfun +endfun "}}}2 " Find out if any buffer was modified. -fun! TabModified(buflist) +fun! TabModified(buflist) "{{{2 let l:i = 0 while l:i < len(a:buflist) if getbufvar(a:buflist[l:i], "&modified") == 1 @@ -951,10 +947,10 @@ fun! TabModified(buflist) let l:i = l:i + 1 endwhile return "" -endfun +endfun "}}}2 " Tab line. -fun! Show_TabLine() +fun! Show_TabLine() "{{{2 let l:s = "%#TabLineFill#Tabs:" let l:i = 0 @@ -978,10 +974,10 @@ fun! Show_TabLine() " Padding. let l:s .= "%#TabLine#%T" return l:s -endfun +endfun "}}}2 " Per tab label for the GUI. -fun! Show_GUITabLine() +fun! Show_GUITabLine() "{{{2 let l:buflist = tabpagebuflist(v:lnum) let l:winnr = tabpagewinnr(v:lnum) let l:s = tabpagewinnr(v:lnum, "$") @@ -990,7 +986,7 @@ fun! Show_GUITabLine() let l:s .= l:modified . " " . l:label return l:s -endfun +endfun "}}}2 se tabline=%!Show_TabLine() se guitablabel=%!Show_GUITabLine() @@ -1030,9 +1026,9 @@ se go+=e " Perforce. let g:p4EnableMenu=1 let g:p4Presets='P4CONFIG' -endif +endif "}}}1 -if version >= "500" " Resize after startup. +if version >= "500" "{{{1 au Display VimEnter * call Startup_Resize() -endif +endif "}}}1