X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=7f1a8f7c548a7286fa2c4edebe891c1bf72f485e;hp=b63d1ba0e7e3226506854ca4afe6924b863dfd2d;hb=3f8b98868d60cd8c7ef15b31d7fcbd545ced7b11;hpb=c204dd8c0a7d9d0c767e01f98f623af5f103c4d9 diff --git a/.vimrc b/.vimrc index b63d1ba..7f1a8f7 100644 --- a/.vimrc +++ b/.vimrc @@ -2,27 +2,24 @@ " Multi-version vimrc compatible with version 4 and above. vim:set fdm=marker: """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Note that "if | call Something() | endif" syntax is unsupported -" in Vim 4 so we write all our functions out the long way. It does work in +" Note that "if | call Something() | endif" syntax is unsupported +" in Vim 4 so we write all our functions out the long way. It does work in " autocommand definitions, however. " Vim 4 complains if version isn't set in the configuration file. version 4.0 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Handle options safe to use in version 4. Vim 4 parses but ignores the -" "if version" syntax used later in this file so we don't use it. No attempt +" Handle options safe to use in version 4. Vim 4 parses but ignores the +" "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. +" Some of these settings should strictly be wrapped inside "if has()" blocks +" but that would cause them not to be ignored by Vim 4. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" "{{{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. @@ -70,16 +67,28 @@ se tags=~/.tags,./tags,tags " Don't timeout waiting to interpet, eg, OA as an escape code. se ttimeoutlen=100 +" Remember undo list for closed (but not wiped) buffers. +se hidden + " 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 ` ' +nnoremap ' ` +nnoremap ` ' + +" Select previous widnow. +nnoremap ^ p +nnoremap p "}}}1 +" Find stuff. +if (has("win32") || has("win64")) && version >= "504" + se rtp=~/.vim,$VIMRUNTIME +endif + """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 5 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -103,59 +112,88 @@ if has("signs") 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 +if has("wildmenu") + 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 +endif " Save sessions in UNIX format with / as file separator. This is " cross-platform. -se ssop+=unix,slash +if has("mksession") + se ssop+=unix,slash +endif " 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 +if has("autocmd") + augroup Display + autocmd! + augroup Mode + autocmd! + if has("signs") + augroup Signs + autocmd! + endif + augroup StatusLine + autocmd! + augroup File autocmd! + augroup END endif -augroup StatusLine -autocmd! -augroup END -" Save the current window width so we can restore it when we quit. +" Save the current window dimensions so we can restore them when we quit. if ! exists("g:oldcols") let g:oldcols=&columns endif +if ! exists("g:oldlines") + let g:oldlines=&lines +endif " More GUI options. Add icon and tearoffs. -se go+=i -se go+=t +if has("gui") + se go+=i + se go+=t +endif " Allow dynamic window resize even if we aren't in an xterm. se t_WS=[8;%p1%d;%p2%dt " Highlight search results. -se hlsearch - -" Set graphical window title. -se titlestring=%{Show_TitleString()} +if has("extra_search") + se hlsearch +endif " 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 +if has("user_commands") + " Catch typos. + command! W :w + command! Wq :wq + command! Wqa :wqa +endif + +" Forget the Ex mode mapping. +map Q + +if has("autocmd") + " 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 5.2 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "502" "{{{1 +version 5.2 " Helper to initialise a variable. fun! Prep_Var(var, value) "{{{2 @@ -167,67 +205,19 @@ endfun "}}}2 " Set up our variables. fun! Iain_Vars() "{{{2 - call Prep_Var("b:iainlist", 0) + call Prep_Var("w: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) + call Prep_Var("g:iainextracolumnsnumber", "''") + call Prep_Var("g:iainextracolumnslist", "''") + call Prep_Var("b:iainalt", 0) if has("signs") call Prep_Var("g:marksigns", 0) call Prep_Var("g:firstsign", 100) endif -endfun "}}}2 - -" Helper for status line. -" Show space, underscore or dollar sign depending on list mode. -fun! Show_List() "{{{2 - call Iain_Vars() - if b:iainlist == 0 - " No list. - return " " - elseif Has_Unicode() - if b:iainlist == 1 - " Just tabs. - return "»" - else - " Full list. - return "¶" - endif - else - if b:iainlist == 1 - return "_" - else - return "\$" - endif - endif -endfun "}}}2 - -" Helper for status line. -" Show c or C to denote case-sensitivity. -fun! Show_Case() "{{{2 - if &ic - return "c" - else - return "C" - endif -endfun "}}}2 - -" Helper for status line. -" Show the size of the tabstop. -fun! Show_Tabstop() "{{{2 - return &ts -endfun "}}}2 - -" Helper for status line. -" Show p when paste mode is on. -fun! Show_Paste() "{{{2 - if &paste - return "p" - else - return "" - endif + call Prep_Var("g:resizable", "''") endfun "}}}2 " Show the window title. @@ -249,39 +239,46 @@ fun! Show_TitleString() "{{{2 return l:ts1 endfun "}}}2 -" Show the status line. -fun! Show_StatusLine() "{{{2 +" Toggle case-sensitivity. +fun! Invert_Case() "{{{2 + let &ic = ! &ic +endfun "}}}2 + +" Can we resize this window? +fun! Can_Resize() "{{{2 call Iain_Vars() - 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' + + if g:resizable == "0" || g:resizable == "1" + return g:resizable endif - if b:iainverbose - let l:sl1=l:sl1 . v:version . '\ %=' - let l:sl2=l:hexformat . '\ \|\ P:%4.6o\ ' + + " Do we KNOW we can(not) resize? + if has("gui_running") + let g:resizable = 1 + elseif $RESIZABLE == &term + let g:resizable = 1 + elseif $RESIZABLE == "0" + let g:resizable = 0 else - let l:sl1=l:sl1 . '%=' - let l:sl2='' + " Assume we can. Allow overriding. + let g:resizable = 1 endif - exec "set statusline=" . l:sl1 . l:sl2 . l:sl3 -endfun "}}}2 - -" Toggle case-sensitivity. -fun! Invert_Case() "{{{2 - let &ic = ! &ic + return g:resizable endfun "}}}2 -" Grow or shrink the window size. +" Grow or shrink the window width. fun! Resize_Columns(op, ...) "{{{2 if a:op == "" return endif + if ! Can_Resize() + return + endif + if a:0 == 0 " Vim 5 hardcodes the size of numbers column to 8. - if version >= "700" + if version >= "700" && has("linebreak") let l:columns = &numberwidth else let l:columns = 8 @@ -307,12 +304,44 @@ fun! Resize_Columns(op, ...) "{{{2 exe l:resize endfun "}}}2 +" Grow or shrink the window height. +fun! Resize_Lines(op, lines) "{{{2 + if a:op == "" + return + endif + + if ! Can_Resize() + return + endif + + exe "let l:resize=" . &lines . a:op . a:lines + if &term =~ '^screen' + let l:resize = l:resize + 1 + endif + let l:resize = "se lines=" . l:resize + + exe l:resize +endfun "}}}2 + " Set extra columns depending on window status. fun! Extra_Columns(extra, var, ...) "{{{2 - if v:version < "700" + " Vim 6 doesn't have winnr("$"). Determine which windows are open + " ourselves by using :windo to incremement a counter. As Vim 5 + " doesn't have :windo we require Vim 6 for this. + if v:version < "600" + return "" + endif + if ! has("windows") return "" endif + " Remember which window we're in. + let l:winnr = winnr() + let l:num_windows = 0 + windo let l:num_windows = l:num_windows + 1 + " Switch back to the window we were in. + exe l:winnr . "wincmd w" + call Iain_Vars() if a:0 == 0 @@ -321,28 +350,34 @@ fun! Extra_Columns(extra, var, ...) "{{{2 let l:condition = a:1 endif + let l:n = 0 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 + let l:windows = "" + while l:n < l:num_windows + " If window w exists then getwinvar(w, "&modified") will be 0 or 1. + if getwinvar(l:i, "&modified") =~ '^\d' + let l:n = l:n + 1 + + let l:val = 0 + exe "if getwinvar(" . l:i . ", '" . a:var . "') " . l:condition . " | let l:val = 1 | endif" + if l:val + exe "let l:windows = '" . l:windows . ":" . l:i . "'" + endif endif let l:i = l:i + 1 endwhile let l:extra = "g:iainextracolumns" . a:extra exe "let l:val = " . l:extra + exe "let " . l:extra . " = '" . l:windows . "'" - if l:num_windows == l:val + if l:windows == l:val return "" endif - exe "let " . l:extra . " = " . l:num_windows - if l:num_windows == 0 + if l:windows == "" return "-" - elseif l:val == 0 + elseif l:val == "" return "+" endif endfun "}}}2 @@ -362,16 +397,21 @@ fun! Number(resize) "{{{2 endfun "}}}2 " Restore window size. -au Display VimLeave * if exists("g:oldcols") | call Resize_Columns("-", (&columns - g:oldcols)) | endif +if has("autocmd") && ! has("gui_running") + au Display VimLeave * if exists("g:oldcols") | call Resize_Columns("-", (&columns - g:oldcols)) | endif + au Display VimLeave * if exists("g:oldlines") | call Resize_Lines("-", (&lines - g:oldlines)) | endif +endif " Map Makefile mode. -au Mode BufEnter * if &ft == "make" | call MakeMode_map() | endif -au Mode BufLeave * if &ft == "make" | call MakeMode_unmap() | endif +if has("autocmd") + au Mode BufEnter * if &ft == "make" | call MakeMode_map() | endif + au Mode BufLeave * if &ft == "make" | call MakeMode_unmap() | endif +endif " Entering Make mode. fun! MakeMode_map() "{{{2 call Iain_Vars() - let b:iainlist=1 + let w:iainlist=1 call Cycle_List() set ts=8 set noexpandtab @@ -384,9 +424,6 @@ fun! MakeMode_unmap() "{{{2 set expandtab 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) "{{{2 if version < "600" @@ -421,9 +458,16 @@ call Mapping(">", ":call Resize_Columns('+'):") call Mapping("<", ":call Resize_Columns('-'):") " Clear search pattern with \/. call Mapping("/", ":let @/=\"\":") +" Toggle alternate buffer name with \#. +call Mapping("#", ":call Cycle_Alt():") -" Forget the Ex mode mapping. -map Q +" Set graphical window title. +if has("win32") || has("win64") + " Windows taskbar entries are probably too small to show full titles. + se titlestring=%t +else + se titlestring=%{Show_TitleString()} +endif " 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\") . \">\"") @@ -461,7 +505,7 @@ fun! Startup_Resize() "{{{2 " Resize for numbers. if &number - if version >= "700" + if version >= "700" && has("linebreak") let l:columns = &numberwidth else let l:columns = 8 @@ -482,114 +526,347 @@ fun! Startup_Resize() "{{{2 endif endfun "}}}2 -" Show numbers by default. -au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif +" 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 + if ! has("statusline") + return + endif + " Get current status. + call Iain_Vars() -" Position the compview plugin window. -au Display BufEnter -SearchResults- set buftype=nowrite | set nonumber | wincmd J -endif "}}}1 + " Change the status based on the flag. XXX: Does Vim let us to do flags? + let l:ic = &ic + set ic + let b:iainstatus = substitute(b:iainstatus, a:flag, a:flag, "") + let &ic = l:ic -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Handle options only available in Vim 6 and above. -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -if version >= "600" "{{{1 -version 6.0 + let l:normalcolour = "darkblue" + let l:editingcolour = "darkmagenta" + let l:warningcolour = "darkred" + let l:readonlycolour = "red" -if has("win32") - se encoding=utf-8 -endif + " Default colour. + 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 l:colour = l:warningcolour + else + let l:colour = l:editingcolour + endif + endif + else + if b:iainstatus =~# "I" + " Regular insert mode. + let l:colour = l:editingcolour + endif + endif -" Remember quickfix state. -let g:quickfixing=0 + " Override again if readonly. + if l:colour != l:normalcolour + if getbufvar("", "&ro") + let l:colour = l:readonlycolour + endif + endif -" Set indenting by filetype. -filetype indent on + let l:termcolour = Iain_Colour(l:colour) -" Less intrusive syntax highlighting. -syn enable + exec "highlight StatusLine gui=none term=none cterm=none guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour + exec "highlight User1 gui=bold term=bold cterm=bold guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour +endfun "}}}2 -" Set colours. -if has("gui_running") - try - if has("win32") - se guifont=DejaVu_Sans_Mono:h10:cANSI - else - se guifont=DejaVu\ Sans\ Mono\ 10 +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 - catch - endtry -endif -if has("gui_running") || &t_Co > 16 - try - colo iain - catch - endtry -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 -" Ignore whitespace when diffing. -se diffopt=filler,iwhite +if has("autocmd") + au StatusLine VimEnter * call Highlight_StatusLine("") -" Expand window when doing a vertical diff. -if &diff - if &columns < 161 - let &columns = &columns * 2 - endif + " Show numbers by default. + au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif endif +endif "}}}1 -" Remember that we are opening the quickfix window. -au Mode BufWinEnter quickfix let g:quickfixing=1 -au Mode BufUnload * if &ft == "qf" | let g:quickfixing=0 | endif +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 5.4 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "504" "{{{1 +version 5.4 -" Allow in-place editing of crontabs. -au Mode FileType crontab set backupcopy=yes +" Reuse windows when using sbuffer. +se switchbuf=useopen -" 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") +" Allow persistent variable saving for localvimrc. +se viminfo+=! -" Set mark and update highlighting. -if has("signs") - au Signs BufReadPost * call Highlight_Signs() - au Signs CursorHold * call Highlight_Signs() -endif +" Do we have Unicode? +fun! Has_Unicode() "{{{2 + if ! has('multi_byte') + return 0 + 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 + if version < "602" + return 0 + endif -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 + if &tenc =~? '^u\(tf\|cs\)' + return 1 + endif -fun! Place_Sign(number, line, old, name) "{{{2 - if a:line == a:old - return a:old + if ! strlen(&tenc) && &enc =~? '^u\(tf\|cs\)' + return 1 + endif + + return 0 +endfun "}}}2 + +" Helper for status line. +" Show space, underscore or dollar sign depending on list mode. +fun! Show_List() "{{{2 + call Iain_Vars() + if w:iainlist == 0 + " No list. + return " " + elseif Has_Unicode() + if w:iainlist == 1 + " Just tabs. + return "»" + else + " Full list. + return "¶" + endif + else + if w:iainlist == 1 + return "_" + else + return "\$" + endif + endif +endfun "}}}2 + +" Helper for status line. +" Show c or C to denote case-sensitivity. +fun! Show_Case() "{{{2 + if &ic + return "c" + else + return "C" + endif +endfun "}}}2 + +" Helper for status line. +" Show the size of the tabstop. +fun! Show_Tabstop() "{{{2 + return &ts +endfun "}}}2 + +" Helper for status line. +" Show p when paste mode is on. +fun! Show_Paste() "{{{2 + if &paste + return "p" + else + return "" + endif +endfun "}}}2 + +" Helper for status line. +" Show v when virtualedit mode is block, insert or onemore. +" Show V when virtualedit mode is all. +fun! Show_VirtualEdit() "{{{2 + if ! has("virtualedit") + return "" + endif + + if &ve == "all" + return "V" + elseif &ve != '' + return "v" + else + return "" + endif +endfun "}}}2 + +" Helper for status line. +" Show U when persistent undo is on. +" Show u when persistent undo is off but an undofile exists. +fun! Show_Undo() "{{{2 + if ! exists("&undofile") + return "" + endif + + if &undofile + return "U" + elseif filereadable(undofile(expand("%"))) + return "u" + else + return "" + endif +endfun "}}}2 + +" Helper for status line. +" Show alternate buffer number and name. +fun! Show_Alt() "{{{2 + let l:alt = bufnr("#") + if l:alt < 0 || l:alt == bufnr("") || ! b:iainalt + return "" + endif + + return " " . l:alt . ": " . expand("#:t") +endfun "}}}2 + +" Helper for status line. +" Show scrollbind or cursorbind. +fun! Show_Bind() "{{{2 + if has("cursorbind") + if &cursorbind + if Has_Unicode() + return "⇄" + else + return ">" + endif + elseif &scrollbind + if Has_Unicode() + return "⇅" + else + return "^" + endif + endif + endif + return "" +endfun "}}}2 + +" Show the status line. +fun! Show_StatusLine() "{{{2 + if ! has("statusline") + return + endif + call Iain_Vars() + let l:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Bind()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R]%{Show_Alt()}\ ' + let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%V%0*\ \|\ %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 "}}}2 + +" Show the status line for the first time. +call Show_StatusLine() +endif "}}}1 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 6 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "600" "{{{1 +version 6.0 + +if has("win32") || has("win64") + se encoding=utf-8 +endif + +" Remember quickfix state. +if has("quickfix") + let g:quickfixing=0 +endif + +" Set indenting by filetype. +filetype indent on + +" Less intrusive syntax highlighting. +if has("syntax") + " The :syntax enable command tries to source the syntax.vim runtime script. + " Parsing this .vimrc will fail if for some reason the runtime doesn't + " exist, as could be the case if the binary was installed with no support + " files. GNU On Windows is one example of an incomplete installation. + try + syn enable + catch + endtry +endif + +" Set colours. +if has("gui_running") + if has("win32") || has("win64") + exe "silent se guifont=DejaVu_Sans_Mono:h10:cANSI" + else + exe "silent se guifont=DejaVu\\ Sans\\ Mono\\ 10" + endif +endif +if has("gui_running") || &t_Co > 16 + exe "silent colo iain" +endif + +" Ignore whitespace when diffing. +if has("diff") + se diffopt=filler,iwhite +endif + +if has("autocmd") + if has("quickfix") + " Remember that we are opening the quickfix window. + au Mode BufWinEnter quickfix let g:quickfixing=1 + au Mode BufUnload * if &ft == "qf" | let g:quickfixing=0 | endif + endif + + " Allow in-place editing of crontabs. + au Mode FileType crontab set backupcopy=yes +endif + +" 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! 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("") @@ -603,33 +880,36 @@ fun! Highlight_Signs(...) "{{{2 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") + let l:signs = g:iainsigns + let l:sign = "" + let l:i = 0 + while strlen(l:signs) + let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+') + + let l:name = substitute(l:sign, '[:.=>-].*', "", "") + let l:var = tolower(l:name) + let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "") + let l:ascii = matchstr(l:sign, '^:.') + let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "") + if strlen(l:ascii) + let l:ascii = substitute(l:ascii, '^:', "", "") + else + let l:ascii = l:mark + endif + let l:ascii = substitute(l:ascii, '"', '\\"', "") + + if l:ascii == "o" + let l:line = "." + else + let l:line = "'" . l:ascii + endif + + call Prep_Sign(l:var) + exe "let " . l:var . " = Place_Sign(" . l:i . ", line(\"" . l:line . "\"), b:sign" . l:var . ", \"Mark" . l:name . "\")" + let l:i = l:i + 1 + + let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") + endwhile endfun "}}}2 " Toggle signs. @@ -640,128 +920,101 @@ fun! Cycle_Signs(resize) "{{{2 call Iain_Vars() let g:marksigns = ! g:marksigns + " Retrofit arrays on to Vim 6. + if ! exists("g:iainsigns") + " Signs are defined in g:iainsigns. The syntax is as follows: + " + " Sign ::= Name (':' Mark)* Type Symbol + " Type ::= '=' | '-' | '.' + " + " Signs with Type '=' will be highlighted with the MarkSign group. + " Signs with Type '-' will be highlighted with the MarkLine group. + " Signs with Type '.' will be highlighted with the MarkDot group. + " Signs with Type '>' will be highlighted with the MarkArrow group. + " Define the Mark where Symbol is not also the mark name, eg "']". + let g:iainsigns = "Less=< Greater=> Left=( Right=) SquareLeft=[ SquareRight=] BraceLeft={ BraceRight=} a-a b-b c-c d-d e-e f-f A-A B-B C-C D-D E-E F-F" + if Has_Unicode() + let g:iainsigns = g:iainsigns . " Quote:\"=” Dash:'=’ Caret:^.ʌ Dot:..•" + if version < "704" + let g:iainsigns = g:iainsigns ." Cursor:o>▶" + endif + else + let g:iainsigns = g:iainsigns . " Quote=\" Dash=' Caret.^ Dot:..*" + if version < "704" + let g:iainsigns = g:iainsigns ." Cursor>o" + endif + endif + endif + 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 + let l:signs = g:iainsigns + let l:sign = "" + while strlen(l:signs) + let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+') + + let l:name = substitute(l:sign, '[:.=>-].*', "", "") + let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "") + let l:ascii = matchstr(l:sign, '^:.') + let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "") + if strlen(l:ascii) + let l:ascii = substitute(l:ascii, '^:', "", "") + let l:ascii = matchstr(l:ascii, '^.') + else + let l:ascii = l:mark + endif + let l:ascii = substitute(l:ascii, '"', '\\"', "") + let l:type = substitute(l:sign, '^:.', "", "") + let l:type = matchstr(l:type, '^.') + + let l:hl = "" + if l:type == "=" + let l:hl = "texthl=MarkSign text=" + elseif l:type == "." + let l:hl = "texthl=MarkDot text=" + elseif l:type == "-" + let l:hl = "texthl=MarkLine text=" + elseif l:type == ">" + let l:hl = "texthl=MarkArrow text=" + endif + + exe "sign define Mark" . l:name . " " . l:hl . l:mark + + let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") + endwhile 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() + let l:i = 0 + while l:i < 25 + exe "sign unplace " . (g:firstsign + l:i) + let l:i = l:i + 1 + endwhile + + let l:signs = g:iainsigns + let l:sign = "" + while strlen(l:signs) + let l:sign = matchstr(l:signs, '^[A-Za-z]\+') + + exe "sign undefine Mark" . l:sign + call Prep_Sign(tolower(l:sign)) + let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") + endwhile + 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() "{{{2 " Pretty UTF-8 listchars. - if Has_Unicode() + if Has_Unicode() let basic='tab:»·,trail:…,extends:«,precedes:»' let eol='eol:¶' if version >= "700" @@ -775,13 +1028,13 @@ fun! Cycle_List() "{{{2 endif endif call Iain_Vars() - let b:iainlist = b:iainlist + 1 - if b:iainlist > 2 - let b:iainlist = 0 + let w:iainlist = w:iainlist + 1 + if w:iainlist > 2 + let w:iainlist = 0 endif - if b:iainlist == 0 + if w:iainlist == 0 setlocal nolist - elseif b:iainlist == 1 + elseif w:iainlist == 1 exec "setlocal lcs=" . basic setlocal list else @@ -789,7 +1042,8 @@ fun! Cycle_List() "{{{2 setlocal list endif - call Resize_Columns(Extra_Columns("list", "&lcs", " =~# 'eol'"), 1) + call Resize_Columns(Extra_Columns("list", "iainlist", " == 2"), 1) + call Extra_Whitespace_Match() endfun "}}}2 " Cycle between hex and decimal display of toolbar stuff. @@ -808,6 +1062,9 @@ endfun "}}}2 " Toggle quickfix window. fun! Cycle_Quickfix() "{{{2 + if ! has("quickfix") + return + endif if g:quickfixing == 1 cclose let g:quickfixing=0 @@ -816,6 +1073,18 @@ fun! Cycle_Quickfix() "{{{2 endif endfun "}}}2 +" Toggle showing alternate buffer information. +fun! Cycle_Alt() "{{{2 + call Iain_Vars() + let b:iainalt = ! b:iainalt + call Show_StatusLine() +endfun "{{{2 + +" To be overridden later if applicable. +fun! Extra_Whitespace_Match() "{{{2 + " NOP. +endfun "}}}2 + " Swap hex/decimal statusline with \x. call Mapping("x", ":call Cycle_HexStatusLine():") " Change statusline verbosity with \v. @@ -834,86 +1103,18 @@ call Mapping("S", ":filetype detect:") " Toggle marks with \m. call Mapping("m", ":call Cycle_Signs(1):") -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 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() - - " Change the status based on the flag. XXX: Does Vim let us to do flags? - 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 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 l:colour = l:warningcolour - else - let l:colour = l:editingcolour - endif - endif - else - if b:iainstatus =~# "I" - " Regular insert mode. - let l:colour = l:editingcolour - endif - endif - - " Override again if readonly. - if l:colour != l:normalcolour - if getbufvar("", "&ro") - let l:colour = l:readonlycolour - endif - endif - - 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 Display VimEnter * call Highlight_StatusLine("") - -" Show signs by default. -au Display VimEnter * call Cycle_Signs(0) +if has("autocmd") + " Show signs by default. + au Display VimEnter * call Cycle_Signs(0) +endif endif "}}}1 +" move. +nmap MoveLineHalfPageUp +nmap MoveLineHalfPageDown +vmap MoveBlockHalfPageUp +vmap MoveBlockHalfPageDown + """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 7 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -988,29 +1189,80 @@ fun! Show_GUITabLine() "{{{2 return l:s endfun "}}}2 -se tabline=%!Show_TabLine() -se guitablabel=%!Show_GUITabLine() +" Handle searching in a BufExplorer window. +fun! BufExplorer_Search(n) "{{{2 + if a:n == 0 + let l:re = '^ *\d %' + else + let l:re = "^ *" . a:n + endif -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") + " Find matching line. + let l:line = search(l:re, 'w') + if ! l:line + return + endif -if has("signs") - au Signs InsertEnter * call Highlight_Signs() - au Signs InsertLeave * call Highlight_Signs() + if a:n == 0 + return + endif + + " Peek ahead to the next matching line. + let l:next = search(l:re, 'w') + + " Select the buffer if the match is unambiguous. + if l:next == l:line + exe "normal \" + return + endif + + " Go back. + call cursor(l:line, 0) +endfun! "}}}2 + +" Entering a BufExplorer window. +fun! BufExplorer_Map() "{{{2 + for l:n in [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + exec "nnoremap " . l:n . " :call BufExplorer_Search(" . l:n . ")" + endfor +endfun "}}}2 + +if has("windows") + se tabline=%!Show_TabLine() + se guitablabel=%!Show_GUITabLine() +endif + +if has("autocmd") + 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 CursorHoldI * call Highlight_Signs() + au Signs InsertEnter * call Highlight_Signs() + au Signs InsertLeave * call Highlight_Signs() + endif + + au Mode BufEnter \[BufExplorer\] call BufExplorer_Map() endif " Limit the size of the popup menu when completing. -se pumheight=20 +if has("insert_expand") + se pumheight=20 +endif " Make diffs vertical by default. -se diffopt+=vertical +if has("diff") + se diffopt+=vertical +endif " Set size of numbers column. -se numberwidth=5 +if has("linebreak") + se numberwidth=5 +endif " Add "previous tab" mapping as gb. map gb :tabprevious: @@ -1018,17 +1270,193 @@ map gb :tabprevious: " Transparency. if has("gui_macvim") se transparency=15 -endif +endif " Yet more GUI options. Add tabs. -se go+=e +if has("gui") + se go+=e +endif " Perforce. let g:p4EnableMenu=1 let g:p4Presets='P4CONFIG' + +" BufExplorer. +let g:bufExplorerShowRelativePath=1 +let g:bufExplorerSplitOutPathName=0 + +" NERDcommenter. +let g:NERDSpaceDelims=1 +endif "}}}1 + +" localvimrc. +let g:localvimrc_persistent=1 + +" Gitv. +let g:Gitv_OpenHorizontal='auto' +let g:Gitv_WipeAllOnClose=1 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 7.2 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "702" "{{{1 +if has("autocmd") + " http://vim.wikia.com/wiki/Highlight_unwanted_spaces + augroup WhitespaceMatch + autocmd! + au Display BufWinEnter * call Extra_Whitespace_Match() + au Display Syntax * call Extra_Whitespace_Match() + au Display BufWinLeave * call clearmatches() + augroup END + + fun! Extra_Whitespace_Match() "{{{2 + " \s\+ + " $ + " \@ + " \%# + let l:pattern = '\s\+\%#\@ + " \(^\s$\) + let l:pattern = '\(^\s$\)\@!' . l:pattern + endif + + let l:hl = 'ctermfg=red guifg=red' + if ! &list + " Underline if we aren't using listchars. + let l:hl = l:hl . ' cterm=underline gui=underline' + endif + highlight clear ExtraWhitespace + exe "highlight ExtraWhitespace " . l:hl + if exists('w:whitespace_match_number') + try + call matchdelete(w:whitespace_match_number) + catch + endtry + call matchadd('ExtraWhitespace', l:pattern, 10, w:whitespace_match_number) + else + let w:whitespace_match_number = matchadd('ExtraWhitespace', l:pattern) + endif + endfun "}}}2 + + call Extra_Whitespace_Match() +endif + +endif "}}}1 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 7.3 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "703" "{{{1 +version 7.3 + +" Toggle persistent undo with \u. +call Mapping("u", ":call Cycle_Undo():") +" Remove persistent undo file with \U. +call Mapping("U", ":call Clear_Undo():") + +" Toggle gundo window with \g. +call Mapping("g", ":call gundo#GundoToggle():") + +" Use a persistent undo file if it exists. +fun! Check_Undo() "{{{2 + if filereadable(undofile(expand("%"))) + setlocal undofile + endif +endfun "}}}2 + +" Toggle persistent undo for this buffer. +fun! Cycle_Undo() "{{{2 + if has("persistent_undo") + let &undofile = ! &undofile + endif +endfun "}}}2 + +" Remove the persistent undo file for this buffer. +fun! Clear_Undo() "{{{2 + if ! has("persistent_undo") + return + endif + + setlocal noundofile + + let l:f = expand("%") + if l:f == "" + return + endif + + let l:u = undofile(l:f) + if l:u == "" + return + endif + + if ! filereadable(l:u) || ! filewritable(l:u) + return + endif + + call delete(l:u) +endfun "}}}2 + +" Toggle ColorColumn at cursor position. +fun! Cycle_ColorColumn() "{{{2 + if ! has("syntax") + return + endif + + let l:cc = &colorcolumn + let l:column = col(".") + let l:re = ",*\\<" . l:column . "\\>" + if l:cc =~# l:re + let l:cc = substitute(l:cc, l:re, "", "g") + else + let l:cc = l:cc . "," . l:column + endif + let &colorcolumn = substitute(l:cc, "^,*", "", "") +endfun "}}}2 + +if has("syntax") + " Enable showing ColorColumn at cursor position with \CC. + call Mapping("CC", ":call Cycle_ColorColumn():") + " Remove last shown ColorColumn with \Cc. + call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\"):") + " Remove all ColorColumns with \Cx. + call Mapping("Cx", ":se colorcolumn=:") +endif + +" Use persistent undo if available. +if has("autocmd") + if has("persistent_undo") + au File BufReadPost * call Check_Undo() + endif + + if has("cursorbind") + au Display WinEnter * if &diff | se cursorbind | endif + endif +endif + +" Mapping to reload the gundo window. +if has("autocmd") + au Mode BufEnter * if &ft == "gundo" | try | nnoremap r :call gundo#GundoToggle():call gundo#GundoToggle() | catch | endtry | endif +endif + +endif "}}}1 +" +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 7.4 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "704" "{{{1 +version 7.4 + +if has("syntax") + se cursorline +endif + endif "}}}1 " Resize after startup. if version >= "500" "{{{1 -au Display VimEnter * call Startup_Resize() +if has("autocmd") + au Display VimEnter * call Startup_Resize() +endif endif "}}}1