X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=b63d1ba0e7e3226506854ca4afe6924b863dfd2d;hp=05646ee25848d35b5a5c92bb3fd8e3f0332600ce;hb=c204dd8c0a7d9d0c767e01f98f623af5f103c4d9;hpb=3fffbc8f6946ccd546512b3f6aa43ff3f099f68f diff --git a/.vimrc b/.vimrc index 05646ee..b63d1ba 100644 --- a/.vimrc +++ b/.vimrc @@ -1,7 +1,5 @@ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" $Id$ -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" 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 @@ -16,19 +14,30 @@ 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 +" Find stuff. +if has("win32") + se rtp=~/.vim,$VIMRUNTIME +endif + " Tabstop 2. se ts=2 " And use spaces not tabs. 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. @@ -61,14 +70,20 @@ se tags=~/.tags,./tags,tags " Don't timeout waiting to interpet, eg, OA as an escape code. se ttimeoutlen=100 -" Use - and = to create underlines. -map - yyp:s/./-/g:let @/='': -map = yyp:s/./=/g:let @/='': +" Use ^B to search backward when completing. +inoremap +" Use ^L to show matching completions but don't select one. +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. @@ -76,21 +91,52 @@ if ! has("gui_running") se bg=dark endif -" Vim 5 hardcodes the size of numbers column to 8. -let numberwidth=8 +" Allow mouse use in a terminal but only if it can work. +if has("xterm_clipboard") + se mouse=nvir +endif + +" Update more quickly. For use with sign highlighting as polling for +" CursorMove makes redrawing slow. +if has("signs") + se updatetime=500 +endif + +" Enable tab-completion prompting for commands. +se wildmenu +" Don't list object files when globbing files to load. +se wildignore+=*.o,*.obj +" So there's no need to assign them low priority. +se suffixes-=*.o,*.obj " Save sessions in UNIX format with / as file separator. This is -" cross-platoform. +" 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! +augroup Mode autocmd! +if has("signs") + augroup Signs + autocmd! +endif +augroup StatusLine +autocmd! +augroup END " Save the current window width so we can restore it when we quit. -let oldcols=&columns +if ! exists("g:oldcols") + let g:oldcols=&columns +endif -" More GUI options. Add icon, tearoffs and toolbar. -se go+=itT +" More GUI options. Add icon and tearoffs. +se go+=i +se go+=t " Allow dynamic window resize even if we aren't in an xterm. se t_WS=[8;%p1%d;%p2%dt @@ -98,151 +144,361 @@ se t_WS=[8;%p1%d;%p2%dt " Highlight search results. se hlsearch -" Syntax highlighting. -syn on +" Set graphical window title. +se titlestring=%{Show_TitleString()} -" Use a discernably different colour to highlight the cursor which shows -" matching brackets. Our regular cursor is green so use blue instead of cyan. -hi MatchParen ctermbg=blue +" Syntax highlighting. New versions will use syn enable instead. +if version < "600" + syn on +endif " Catch typos. 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 +" Helper to initialise a variable. +fun! Prep_Var(var, value) "{{{2 + if exists(a:var) + return endif - if ! exists("b:iainstatus") - " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old. - let b:iainstatus = "Fih" + 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") + 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() "{{{2 + if bufname("") == "" + let l:ts1='Vim' + else + " Vim 5 doesn't have printf. + let l:ts1=bufnr("") + if l:ts1 < 10 + let l:ts1=" " . l:ts1 + endif + let l:ts1=l:ts1 . ": " . expand('%t') + endif + let l:ts1=l:ts1 . " (" . getcwd() . ")" + if has("clientserver") + let l:ts1=l:ts1 . " " . v:servername + endif + return l:ts1 +endfun "}}}2 " Show the status line. -fun! Show_StatusLine() +fun! Show_StatusLine() "{{{2 call Iain_Vars() - let sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=' - let sl3='L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P' - let hexformat='%b' + 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 hexformat='0\x%02B' + let l:hexformat='0\x%02B' endif if b:iainverbose - let sl2=hexformat . '\ \|\ P:%4.6o\ ' + let l:sl1=l:sl1 . v:version . '\ %=' + let l:sl2=l:hexformat . '\ \|\ P:%4.6o\ ' else - let sl2='' + let l:sl1=l:sl1 . '%=' + let l:sl2='' endif - exec "set statusline=" . sl1 . sl2 . sl3 -endfun + exec "set statusline=" . l:sl1 . l:sl2 . l:sl3 +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, ...) "{{{2 + if a:op == "" + return + endif + + if a:0 == 0 + " Vim 5 hardcodes the size of numbers column to 8. + if version >= "700" + let l:columns = &numberwidth + else + let l:columns = 8 + endif + else + let l:columns = a:1 + endif + + exe "let l:resize=" . &columns . a:op . l:columns + let l:resize = "se columns=" . l:resize + + " HACK: Inside screen there is an extra line for the status bar. Vim + " manages the resize by sending an escape sequence to set the number of + " lines and number of columns in one action. To do this it will first query + " the number of lines and then set by . Because of the extra line for the status bar this results in + " the real terminal being shrunk by a line. We ask for the terminal to grow + " by a line so it ends up actually being the same. + if &term =~ '^screen' + let l:resize = l:resize . " lines=" . (&lines + 1) + endif + + exe l:resize +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) "{{{2 + call Iain_Vars() + let &number = ! &number + + " 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 a:resize + call Resize_Columns(l:extra) + endif +endfun "}}}2 " Restore window size. -au VimLeave * if exists("oldcols") | let &columns=oldcols | endif +au Display VimLeave * if exists("g:oldcols") | call Resize_Columns("-", (&columns - g:oldcols)) | endif " Map Makefile mode. -au BufEnter * if &ft == "make" | call MakeMode_map() | endif -au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif +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() - set list +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() - set nolist +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() -" Change to ts=2 with Q2. -map Q2 :se ts=2: -" Change to ts=4 with Q4. -map Q4 :se ts=4: -" Change to ts=8 with Q8. -map Q8 :se ts=8: -" Change to ts=16 with Q6. -map Q6 :se ts=16: -" Change to ts=32 with Q3. -map Q3 :se ts=32: -" Toggle paste mode with Qp. -map Qp :se paste!: -" Swap case-sensitivity with Qc. -map Qc :call Invert_Case(): -" Change number mode with Qn. -map Qn :se number!: -" Expand or shrink window size with Q> and Q<. For use after toggling number. -map Q> :exe 'se columns+=' . numberwidth: -map Q< :exe 'se columns-=' . numberwidth: -" Clear search pattern with Q/. -map Q/ :let @/="": +" Function to create mappings with either a hardcoded \ or . +fun! Mapping(keysequence,mapping) "{{{2 + if version < "600" + exec "map \\" . a:keysequence . " " . a:mapping + else + exec "map " . a:keysequence . " " . a:mapping + endif +endfun "}}}2 -endif +" Use - and = to create underlines. +call Mapping("-", "yyp:s/./-/g:let @/='':") +call Mapping("=", "yyp:s/./=/g:let @/='':") + +" Change to ts=2 with \2. +call Mapping("2", ":se ts=2:") +" Change to ts=4 with \4. +call Mapping("4", ":se ts=4:") +" Change to ts=8 with \8. +call Mapping("8", ":se ts=8:") +" Change to ts=16 with \6. +call Mapping("6", ":se ts=16:") +" Change to ts=32 with \3. +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():") +" Change number mode with \n. +call Mapping("n", ":call Number(1):") +" Expand or shrink window size with \> and \<. +call Mapping(">", ":call Resize_Columns('+'):") +call Mapping("<", ":call Resize_Columns('-'):") +" Clear search pattern with \/. +call Mapping("/", ":let @/=\"\":") + +" Forget the Ex mode mapping. +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() "{{{2 + if exists("uncluttered_buffer") + if uncluttered_buffer == 1 + return 1 + endif + endif + + if version >= "600" + if &buftype != '' + return 1 + endif + endif + + if &ft == 'perforce' + return 1 + endif + + if &ft == 'svn' + return 1 + endif + + if &ft == 'gitcommit' + return 1 + endif + + return 0 +endfun "}}}2 + +fun! Startup_Resize() "{{{2 + let l:columns = 0 + + " Resize for numbers. + if &number + if version >= "700" + let l:columns = &numberwidth + else + let l:columns = 8 + endif + endif + + " Resize for signs. + if has("signs") + if g:marksigns + if version >= "600" + let l:columns = l:columns + 2 + endif + endif + endif + + if g:oldcols < (80 + l:columns) + call Resize_Columns("+", l:columns) + endif +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 "}}}1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 6 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -if version >= "600" +if version >= "600" "{{{1 version 6.0 +if has("win32") + se encoding=utf-8 +endif + " Remember quickfix state. let g:quickfixing=0 @@ -252,13 +508,22 @@ filetype indent on " Less intrusive syntax highlighting. syn enable -" Nice GUI colour. +" Set colours. if has("gui_running") - se guifont=DejaVu\ Sans\ Mono\ 10 - colo darkblue + try + if has("win32") + se guifont=DejaVu_Sans_Mono:h10:cANSI + else + se guifont=DejaVu\ Sans\ Mono\ 10 + endif + catch + endtry endif -if has("win32") - se guifont=DejaVu_Sans_Mono:h10:cANSI +if has("gui_running") || &t_Co > 16 + try + colo iain + catch + endtry endif " Ignore whitespace when diffing. @@ -266,98 +531,340 @@ 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 -" Status bar matches the colour. -highlight StatusLine guifg=white guibg=darkblue ctermbg=white ctermfg=darkblue - -" Numbers in blue. -highlight LineNr term=underline cterm=bold guifg=blue ctermfg=blue - " Remember that we are opening the quickfix window. -au BufWinEnter quickfix let g:quickfixing=1 -au BufUnload * if &ft == "qf" | let g:quickfixing=0 | endif +au Mode BufWinEnter quickfix let g:quickfixing=1 +au Mode BufUnload * if &ft == "qf" | let g:quickfixing=0 | endif + +" Allow in-place editing of crontabs. +au Mode FileType crontab set backupcopy=yes " Make * and # work the way you expect in visual mode. vnoremap * y/\V=substitute(escape(@@,"/\\"),"\n","\\\\n","ge") vnoremap # y?\V=substitute(escape(@@,"?\\"),"\n","\\\\n","ge") +" Set mark and update highlighting. +if has("signs") + au Signs BufReadPost * call Highlight_Signs() + au Signs CursorHold * call Highlight_Signs() +endif + +" 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 + + exe "sign unplace " . (g:firstsign + a:number) . " buffer=" . bufnr("") + " 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 "}}}2 + +fun! Highlight_Signs(...) "{{{2 + if ! has("signs") || ! g:marksigns || Uncluttered_Buffer() + return + endif + + call Prep_Signs() + + let b:signdot = Place_Sign(0, line("'."), b:signdot, "MarkDot") + 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: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 "}}}2 + +" Toggle signs. +fun! Cycle_Signs(resize) "{{{2 + if ! has("signs") + return + endif + call Iain_Vars() + let g:marksigns = ! g:marksigns + + if g:marksigns + " Signs to highlight marks. + " Syntax won't work properly in Vim 6. + if Has_Unicode() + sign define MarkDash text=’ texthl=MarkSign + sign define MarkDot text=• texthl=MarkDot + sign define MarkQuote text=” texthl=MarkSign + else + sign define MarkDash text=' texthl=MarkSign + sign define MarkDot text=* texthl=MarkDot + sign define MarkQuote text=" texthl=MarkSign + endif + 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 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 + sign define Markd text=d texthl=MarkSign linehl=MarkLine + sign define Marke text=e texthl=MarkSign linehl=MarkLine + sign define Markf text=f texthl=MarkSign linehl=MarkLine + 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 + sign define MarkD text=D texthl=MarkSign linehl=MarkLine + sign define MarkE text=E texthl=MarkSign linehl=MarkLine + sign define MarkF text=F texthl=MarkSign linehl=MarkLine + + if a:resize + call Resize_Columns("+", 2) + endif + call Highlight_Signs() + else + exe "sign unplace " . (g:firstsign + 0) + exe "sign unplace " . (g:firstsign + 1) + exe "sign unplace " . (g:firstsign + 2) + exe "sign unplace " . (g:firstsign + 3) + exe "sign unplace " . (g:firstsign + 4) + exe "sign unplace " . (g:firstsign + 5) + exe "sign unplace " . (g:firstsign + 6) + exe "sign unplace " . (g:firstsign + 7) + exe "sign unplace " . (g:firstsign + 8) + exe "sign unplace " . (g:firstsign + 9) + exe "sign unplace " . (g:firstsign + 10) + exe "sign unplace " . (g:firstsign + 11) + exe "sign unplace " . (g:firstsign + 12) + exe "sign unplace " . (g:firstsign + 13) + exe "sign unplace " . (g:firstsign + 14) + exe "sign unplace " . (g:firstsign + 15) + exe "sign unplace " . (g:firstsign + 16) + 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 + sign undefine MarkQuote + sign undefine MarkCaret + sign undefine MarkLess + 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 + sign undefine Markd + sign undefine Marke + sign undefine Markf + sign undefine MarkA + sign undefine MarkB + sign undefine MarkC + sign undefine MarkD + sign undefine MarkE + sign undefine MarkF + + call Prep_Signs() + if a:resize + call Resize_Columns("-", 2) + endif + endif +endfun "}}}2 + +" Do we have Unicode? +fun! Has_Unicode() "{{{2 + if ! has('multi_byte') + return 0 + endif + + if version < "602" + return 0 + endif + + if &tenc =~? '^u\(tf\|cs\)' + return 1 + endif + + if ! strlen(&tenc) && &enc =~? '^u\(tf\|cs\)' + return 1 + endif + + return 0 +endfun "}}}2 + " Change list mode. -fun! Cycle_List() - let basic='tab:\\_,trail:_,extends:<,precedes:>' +fun! Cycle_List() "{{{2 + " Pretty UTF-8 listchars. + if Has_Unicode() + 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 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 - 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 - -" We use Q for various commands. Unmap it. -" Vim 5 won't let us unmap this as it treats Q as an ambiguous mapping (because -" Qx also exists. With Vim 5 you are rewarded with Ex mode if you don't type -" the Qx sequence quickly enough. Vim 6 allows us to forget the Ex mapping. -map Q - -" Swap hex/decimal statusline with Qx. -map Qx :call Cycle_HexStatusLine(): -" Change statusline verbosity with Qv. -map Qv :call Cycle_VerboseStatusLine(): -" Cycle list styles with Ql. -map Ql :call Cycle_List(): -" Toggle tags with Qt. -map Qt :Tlist -" Change foldmethod with Qf. -map Qf :se foldenable!: -" Toggle quickfix window with Qq. -map Qq :call Cycle_Quickfix(): -" Rerun filetype detection with Qs. The s is for syntax, as this will be +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():") +" Cycle list styles with \l. +call Mapping("l", ":call Cycle_List():") +" Toggle tags with \t. +call Mapping("t", ":Tlist") +" Change foldmethod with \f. +call Mapping("f", ":se foldenable!:") +" Toggle quickfix window with \q. +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. -map Qs :filetype detect: +call Mapping("S", ":filetype detect:") +" Toggle marks with \m. +call Mapping("m", ":call Cycle_Signs(1):") -endif - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Handle options only available in Vim 7 and above. -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -if version >= "700" -version 7.0 +fun! Iain_Colour(colour) "{{{2 + if &t_Co == 88 + if a:colour == "darkblue" + return 17 + elseif a:colour == "darkmagenta" + return 33 + elseif a:colour == "darkred" + return 32 + elseif a:colour == "red" + return 64 + endif + elseif &t_Co == 256 + if a:colour == "darkblue" + return 17 + elseif a:colour == "darkmagenta" + return 90 + elseif a:colour == "darkred" + return 88 + elseif a:colour == "red" + return 196 + endif + else + return a:colour + endif +endfun "}}}2 -" Change status bar colour when entering insert mode. -fun! Highlight_StatusLine(flag) +" 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) "{{{2 " Get current status. call Iain_Vars() @@ -365,50 +872,139 @@ fun! Highlight_StatusLine(flag) let re = "[" . tolower(a:flag) . toupper(a:flag) . "]" let b:iainstatus = substitute(b:iainstatus, re, a:flag, "") + let l:normalcolour = "darkblue" + let l:editingcolour = "darkmagenta" + let l:warningcolour = "darkred" + let l:readonlycolour = "red" + " Default colour. - let s:colour = "darkblue" - let s:termcolour = "" - let s:term88colour = "17" - let s:term256colour = "17" + let l:colour = l:normalcolour " Maybe override depending on status. if b:iainstatus =~# "H" if b:iainstatus =~# "I" " Held in insert mode. Add extra highlight if we don't have focus. if b:iainstatus =~# "f" - let s:colour = "darkmagenta" + let l:colour = l:warningcolour else - let s:colour = "darkred" + let l:colour = l:editingcolour endif - let s:term88colour = "32" - let s:term256colour = "88" endif else if b:iainstatus =~# "I" " Regular insert mode. - let s:colour = "darkred" - let s:term88colour = "32" - let s:term256colour = "88" + let l:colour = l:editingcolour endif endif - if &t_Co == 88 - let s:termcolour = s:term88colour - elseif &t_Co == 256 - let s:termcolour = s:term256colour - else - let s:termcolour = s:colour + " Override again if readonly. + if l:colour != l:normalcolour + if getbufvar("", "&ro") + let l:colour = l:readonlycolour + endif endif - exec "highlight StatusLine guifg=white guibg=" . s:colour . " ctermbg=white ctermfg=" . s:termcolour -endfun + 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 "}}}2 -au CursorHoldI * call Highlight_StatusLine("H") -au CursorMovedI * call Highlight_StatusLine("h") -au FocusGained * call Highlight_StatusLine("F") -au FocusLost * call Highlight_StatusLine("f") -au InsertEnter * call Highlight_StatusLine("I") -au InsertLeave * call Highlight_StatusLine("i") -call Highlight_StatusLine("") +au Display VimEnter * call Highlight_StatusLine("") + +" Show signs by default. +au Display VimEnter * call Cycle_Signs(0) +endif "}}}1 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 7 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "700" "{{{1 +version 7.0 + +" Helper to show tab name. +fun! TabName(label, gui) "{{{2 + let l:label = a:label + if l:label == "" + let l:label = "No Name" + if a:gui + let l:label = "[" . l:label . "]" + endif + else + let l:label = fnamemodify(l:label, ":t") + if strlen(l:label) >= 18 + let l:label = l:label[0:17] . ".." + endif + endif + return l:label +endfun "}}}2 + +" Find out if any buffer was modified. +fun! TabModified(buflist) "{{{2 + let l:i = 0 + while l:i < len(a:buflist) + if getbufvar(a:buflist[l:i], "&modified") == 1 + return "+" + endif + let l:i = l:i + 1 + endwhile + return "" +endfun "}}}2 + +" Tab line. +fun! Show_TabLine() "{{{2 + let l:s = "%#TabLineFill#Tabs:" + + let l:i = 0 + while l:i < tabpagenr("$") + let l:i = l:i + 1 + " Get the label. + let l:buflist = tabpagebuflist(l:i) + let l:winnr = tabpagewinnr(l:i) + let l:n = tabpagewinnr(l:i, "$") + let l:label = TabName(bufname(l:buflist[l:winnr - 1]), 0) + let l:modified = TabModified(l:buflist) + + " Choose highlighting. + if l:i == tabpagenr() + let l:s .= "%#TabLineSel#[" . l:n . l:modified . " " . l:label . "]" + else + let l:s .= "%#TabLine# " . l:n . l:modified . " " . l:label . " " + endif + endwhile + + " Padding. + let l:s .= "%#TabLine#%T" + return l:s +endfun "}}}2 + +" Per tab label for the GUI. +fun! Show_GUITabLine() "{{{2 + let l:buflist = tabpagebuflist(v:lnum) + let l:winnr = tabpagewinnr(v:lnum) + let l:s = tabpagewinnr(v:lnum, "$") + let l:label = TabName(bufname(l:buflist[l:winnr - 1]), 1) + let l:modified = TabModified(l:buflist) + + let l:s .= l:modified . " " . l:label + return l:s +endfun "}}}2 + +se tabline=%!Show_TabLine() +se guitablabel=%!Show_GUITabLine() + +au StatusLine CursorHoldI * call Highlight_StatusLine("H") +au StatusLine CursorMovedI * call Highlight_StatusLine("h") +au StatusLine FocusGained * call Highlight_StatusLine("F") +au StatusLine FocusLost * call Highlight_StatusLine("f") +au StatusLine InsertEnter * call Highlight_StatusLine("I") +au StatusLine InsertLeave * call Highlight_StatusLine("i") + +if has("signs") + au Signs InsertEnter * call Highlight_Signs() + au Signs InsertLeave * call Highlight_Signs() +endif + +" Limit the size of the popup menu when completing. +se pumheight=20 " Make diffs vertical by default. se diffopt+=vertical @@ -417,5 +1013,22 @@ se diffopt+=vertical se numberwidth=5 " Add "previous tab" mapping as gb. -map gb :tabPrev -endif +map gb :tabprevious: + +" Transparency. +if has("gui_macvim") + se transparency=15 +endif + +" Yet more GUI options. Add tabs. +se go+=e + +" Perforce. +let g:p4EnableMenu=1 +let g:p4Presets='P4CONFIG' +endif "}}}1 + +" Resize after startup. +if version >= "500" "{{{1 +au Display VimEnter * call Startup_Resize() +endif "}}}1