X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=99063035ef06da35b798932af03549495febf29a;hp=26ce8dbbebc199c00d4d058669be8b7469438c0f;hb=cfe2fb3b392b34e073360cc91b00ace56e048341;hpb=3f3bc49b281988f04653f35e777d375f49398a77 diff --git a/.vimrc b/.vimrc index 26ce8db..9906303 100644 --- a/.vimrc +++ b/.vimrc @@ -1,28 +1,25 @@ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Multi-version vimrc compatible with version 4 and above. vim:set fdm=marker: +" Multi-version vimrc compatible with version 4 and above. vim6: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") || has("win64") - 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,53 +112,60 @@ 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. -if has("win32") || has("win64") - " Windows taskbar entries are probably too small to show full titles. - se titlestring=%t -else - se titlestring=%{Show_TitleString()} +if has("extra_search") + se hlsearch endif " Syntax highlighting. New versions will use syn enable instead. @@ -157,10 +173,27 @@ 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 @@ -179,61 +212,12 @@ fun! Iain_Vars() "{{{2 call Prep_Var("b:iainstatus", "'Fih'") call Prep_Var("g:iainextracolumnsnumber", "''") call Prep_Var("g:iainextracolumnslist", "''") - call Prep_Var("b:iaincul", 0) + 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 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 + call Prep_Var("g:resizable", "''") endfun "}}}2 " Show the window title. @@ -255,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\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ ' - let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%0*\ \|\ %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 @@ -313,14 +304,36 @@ 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 " Vim 6 doesn't have winnr("$"). Determine which windows are open - " ourselves by using :windo to incremement a counter. As Vim 5 + " 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() @@ -345,9 +358,9 @@ fun! Extra_Columns(extra, var, ...) "{{{2 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 + 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 @@ -373,6 +386,9 @@ endfun "}}}2 fun! Number(resize) "{{{2 call Iain_Vars() let &number = ! &number + if version >= 700 + let &relativenumber = &number + endif " Ensure we keep track of any extra columns even if we aren't resizing. " This prevents confusion when number is set at startup. @@ -384,11 +400,16 @@ 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 @@ -406,46 +427,67 @@ 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 +fun! Mapping(keysequence, mapping, ...) "{{{2 if version < "600" - exec "map \\" . a:keysequence . " " . a:mapping + let l:args = "\\" . a:keysequence . " " . a:mapping . ":" + else + let l:args = " " . a:keysequence . " " . a:mapping + endif + if a:0 == 0 + " General mapping. + exec "map " . l:args else - exec "map " . a:keysequence . " " . a:mapping + " Specific mapping(s). + let l:i = 1 + while l:i <= a:0 + exec "let l:map = a:" . l:i . " . \"map\"" + exec l:map . " " . l:args + let l:i = l:i + 1 + endwhile endif endfun "}}}2 " 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:") +call Mapping("-", "yyp:s/./-/g:let @/=''") +call Mapping("=", "yyp:s/./=/g:let @/=''") + +fun! Tab_Width(width) "{{{2 + exec "set sw=" . a:width + exec "set ts=" . a:width +endfun "}}}2 + +" Set 2-column tabs with \2. +call Mapping("2", ":call Tab_Width(2)") +" Set 4-column tabs with \4. +call Mapping("4", ":call Tab_Width(4)") +" Set 8-column tabs with \8. +call Mapping("8", ":call Tab_Width(8)") +" Set 16-column tabs with \6. +call Mapping("6", ":call Tab_Width(16)") +" Set 32-column tabs with \3. +call Mapping("3", ":call Tab_Width(32)") " Toggle paste mode with \p. -call Mapping("p", ":se paste!:") +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):") +call Mapping("n", ":call Number(1)") " Expand or shrink window size with \> and \<. -call Mapping(">", ":call Resize_Columns('+'):") -call Mapping("<", ":call Resize_Columns('-'):") +call Mapping(">", ":call Resize_Columns('+')") +call Mapping("<", ":call Resize_Columns('-')") " Clear search pattern with \/. -call Mapping("/", ":let @/=\"\":") +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\") . \">\"") @@ -483,7 +525,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 @@ -509,6 +551,9 @@ endfun "}}}2 " 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() @@ -520,9 +565,16 @@ fun! Highlight_StatusLine(flag) "{{{2 let l:normalcolour = "darkblue" let l:editingcolour = "darkmagenta" + let l:replacecolour = "purple" let l:warningcolour = "darkred" let l:readonlycolour = "red" + if b:iainstatus =~# "I" + if v:insertmode == "r" + let l:editingcolour = l:replacecolour + endif + endif + " Default colour. let l:colour = l:normalcolour " Maybe override depending on status. @@ -561,6 +613,8 @@ fun! Iain_Colour(colour) "{{{2 return 17 elseif a:colour == "darkmagenta" return 33 + elseif a:colour == "purple" + return 35 elseif a:colour == "darkred" return 32 elseif a:colour == "red" @@ -571,23 +625,357 @@ fun! Iain_Colour(colour) "{{{2 return 17 elseif a:colour == "darkmagenta" return 90 + elseif a:colour == "purple" + return 57 elseif a:colour == "darkred" return 88 elseif a:colour == "red" return 196 endif else + " Colours which cterm*g doesn't recognise. + if a:colour == "purple" + return "magenta" + endif return a:colour endif endfun "}}}2 -au StatusLine VimEnter * call Highlight_StatusLine("") +if has("autocmd") + au StatusLine VimEnter * call Highlight_StatusLine("") + + " Show numbers by default. + au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif +endif +endif "}}}1 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 5.4 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "504" "{{{1 +version 5.4 + +" Reuse windows when using sbuffer. +se switchbuf=useopen + +" Vim 5 requires a 'n setting for viminfo. +if ! &viminfo + se viminfo='100 +endif + +" Allow persistent variable saving for localvimrc. +se viminfo+=! + +" 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 + +" Helper for status line. +" Show file encoding +fun! Show_Encoding() "{{{2 + if version < "600" + return "" + endif + + let l:enc = &fenc + let l:symbol = "" + if l:enc == "" + let l:enc = &enc + if l:enc == "" + return "" + endif + if bufname("%") == "" + if Has_Unicode() + let l:symbol = '•' + else + let l:symbol = '*' + endif + endif + endif + + if has("multi_byte") + if &bomb + if Has_Unicode() + let l:symbol = "☻" + else + let l:symbol = "@" + endif + endif + endif + + " Don't return anything if the encoding is utf-8. + if l:enc == "utf-8" + if l:symbol == "" + return "" + endif + endif + + return l:symbol . l:enc . "," +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 -" Show numbers by default. -au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif +" 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 -" Position the compview plugin window. -au Display BufEnter -SearchResults- set buftype=nowrite | set nonumber | wincmd J +" Helper for status line. +" Mark DOS buffers. +fun! Show_DOS() "{{{2 + if &ff == "unix" + return "" + endif + return &ff . "," +endfun "}}}2 + +" Helper for status line. +" Show the size of the tabstop. +fun! Show_Tabstop() "{{{2 + if &et + return &ts + else + if Has_Unicode() + return &ts . "↹" + else + return &ts . "\\" + fi + endif +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 + +" Helper for status line. +" Show marker if searchforward is unset. +fun! Show_SearchForward() "{{{2 + if version >= "702" + if ! v:searchforward + if Has_Unicode() + return "∆" + else + return "^" + endif + endif + endif + return "" +endfun "}}}2 + +" Helper for status line. +" Show marks set in cursor line. +fun! Show_Marks() "{{{2 + if ! exists("g:iainsigns") + return "" + endif + + let l:marks = "" + + let l:signs = g:iainsigns + let l:sign = "" + let l:cursorline = line(".") + while strlen(l:signs) + let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+') + 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 + + " Ignore cursor line which will always match. + if l:line != "." + if l:cursorline == line(l:line) + let l:marks = l:marks . l:mark + endif + endif + + let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") + endwhile + + if l:marks == "" + return "" + else + return "M:" . l:marks . " " + endif +endfun "}}}2 + +" Helper for status lines. +" Show Space plugin command. +fun! Show_Space() "{{{2 + if exists("*GetSpaceMovement") + let l:ret = GetSpaceMovement() + if l:ret != "" + if Has_Unicode() + let l:ret = "▭" . l:ret . Show_SearchForward() + else + let l:ret = "[" . l:ret . Show_SearchForward() . "]" + endif + endif + return l:ret + else + return Show_SearchForward() + endif +endfun "}}}2 + +" Show the status line. +fun! Show_StatusLine() "{{{2 + if ! has("statusline") + return + endif + call Iain_Vars() + + " User{N} highlights %{N}*. + " Named highlight groups %#group% aren't available until Vim 7. + let l:normal = '%0*' + let l:bold = '%1*' + + " sl1 contains left-aligned stuff. + " sl2 contains stuff shown only when verbose mode is enabled. + " sl3 contains right-aligned stuff. + let l:sl1='%2n\:\ %<' . l:bold . '%f' . l:normal . '\ [%{Show_Encoding()}%{Show_DOS()}%{Show_List()}%{Show_Bind()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R%{Show_Space()}]%{Show_Alt()}\ ' + let l:sl3='%{Show_Marks()}L:' . l:bold . '%4.6l' . l:normal . '/%-4.6L\ C:' . l:bold . '%3.6c%V' . l:normal . '\ \|\ %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 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -596,18 +984,29 @@ endif "}}}1 if version >= "600" "{{{1 version 6.0 -if has("gui_win32") +if has("win32") || has("win64") se encoding=utf-8 endif " Remember quickfix state. -let g:quickfixing=0 +if has("quickfix") + let g:quickfixing=0 +endif " Set indenting by filetype. filetype indent on " Less intrusive syntax highlighting. -syn enable +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") @@ -622,21 +1021,20 @@ if has("gui_running") || &t_Co > 16 endif " Ignore whitespace when diffing. -se diffopt=filler,iwhite - -" Expand window when doing a vertical diff. -if &diff - if &columns < 161 - let &columns = &columns * 2 - endif +if has("diff") + se diffopt=filler,iwhite endif -" 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 +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 + " 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") @@ -675,13 +1073,13 @@ fun! Highlight_Signs(...) "{{{2 let l:sign = "" let l:i = 0 while strlen(l:signs) - let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+') + let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+') - let l:name = substitute(l:sign, '[:.=-].*', "", "") + 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, '^\(:.\)*[.-=]', "", "") + let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "") if strlen(l:ascii) let l:ascii = substitute(l:ascii, '^:', "", "") else @@ -689,8 +1087,14 @@ fun! Highlight_Signs(...) "{{{2 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:ascii . "\"), b:sign" . l:var . ", \"Mark" . l:name . "\")" + 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, '^[^ ]\+ *', "", "") @@ -715,13 +1119,20 @@ fun! Cycle_Signs(resize) "{{{2 " 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 "']". - if Has_Unicode() - let g:iainsigns = "Dash:'=’ Dot:..• Quote:\"=” Caret:^.ʌ" + 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 = "Dash=' Dot:..* Quote=\" Caret.^" + let g:iainsigns = g:iainsigns . " Quote=\" Dash=' Caret.^ Dot:..*" + if version < "704" + let g:iainsigns = g:iainsigns ." Cursor>o" + endif endif - let g:iainsigns = 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" endif if g:marksigns @@ -730,14 +1141,34 @@ fun! Cycle_Signs(resize) "{{{2 let l:signs = g:iainsigns let l:sign = "" while strlen(l:signs) - let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+') - - let l:sign = substitute(l:sign, ':.', "", "") - let l:sign = substitute(l:sign, '=', " texthl=MarkSign text=", "") - let l:sign = substitute(l:sign, '\.', " texthl=MarkDot text=", "") - let l:sign = substitute(l:sign, '-', " texthl=MarkLine text=", "") + 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:sign + exe "sign define Mark" . l:name . " " . l:hl . l:mark let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") endwhile @@ -769,32 +1200,11 @@ fun! Cycle_Signs(resize) "{{{2 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() - let basic='tab:»·,trail:…,extends:«,precedes:»' + if Has_Unicode() + let basic='tab:⇥·,trail:…,extends:«,precedes:»' let eol='eol:¶' if version >= "700" let basic=basic . ',nbsp:•' @@ -822,6 +1232,7 @@ fun! Cycle_List() "{{{2 endif call Resize_Columns(Extra_Columns("list", "iainlist", " == 2"), 1) + call Extra_Whitespace_Match() endfun "}}}2 " Cycle between hex and decimal display of toolbar stuff. @@ -840,6 +1251,9 @@ endfun "}}}2 " Toggle quickfix window. fun! Cycle_Quickfix() "{{{2 + if ! has("quickfix") + return + endif if g:quickfixing == 1 cclose let g:quickfixing=0 @@ -848,26 +1262,46 @@ 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():") +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():") +call Mapping("l", ":call Cycle_List()") " Toggle tags with \t. call Mapping("t", ":Tlist") " Change foldmethod with \f. -call Mapping("f", ":se foldenable!:") +call Mapping("f", ":se foldenable!") " Toggle quickfix window with \q. -call Mapping("q", ":call Cycle_Quickfix():") +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):") +call Mapping("m", ":call Cycle_Signs(1)") + +if has("autocmd") + " Show signs by default. + au Display VimEnter * call Cycle_Signs(0) +endif -" Show signs by default. -au Display VimEnter * call Cycle_Signs(0) +" move. +nmap MoveLineHalfPageUp +nmap MoveLineHalfPageDown +vmap MoveBlockHalfPageUp +vmap MoveBlockHalfPageDown endif "}}}1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -876,6 +1310,11 @@ endif "}}}1 if version >= "700" "{{{1 version 7.0 +" Narrow buffer with \w. +call Mapping("w", ":NarrowRegion", "n", "v") +" Narrow window with \W. +call Mapping("W", ":NarrowWindow", "n", "v") + " Helper to show tab name. fun! TabName(label, gui) "{{{2 let l:label = a:label @@ -907,7 +1346,15 @@ endfun "}}}2 " Tab line. fun! Show_TabLine() "{{{2 - let l:s = "%#TabLineFill#Tabs:" + let l:colwidth = &numberwidth + if g:marksigns + let l:colwidth += 2 + endif + if &diff == 1 + let l:colwidth += 2 + endif + let l:fmt = printf("%%s%% %ds", l:colwidth) + let l:s = printf(l:fmt, "%#TabLineFill#", "Tabs ") let l:i = 0 while l:i < tabpagenr("$") @@ -944,44 +1391,81 @@ fun! Show_GUITabLine() "{{{2 return l:s endfun "}}}2 -" Toggle highlighting cursor line when focus changes. -fun! ToggleCursorLine() "{{{2 - call Iain_Vars() +" 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 + + " Find matching line. + let l:line = search(l:re, 'w') + if ! l:line + return + endif + + if a:n == 0 + return + endif + + " Peek ahead to the next matching line. + let l:next = search(l:re, 'w') - if b:iainstatus =~# "f" && b:iainstatus =~# "H" && b:iainstatus =~# "I" - " Focus lost while held in insert mode. - let b:iaincul = getbufvar("", "&cursorline") - setlocal cursorline - elseif ! b:iaincul - setlocal nocursorline + " 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 -se tabline=%!Show_TabLine() -se guitablabel=%!Show_GUITabLine() +if has("windows") + se tabline=%!Show_TabLine() + se guitablabel=%!Show_GUITabLine() +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") +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 InsertChange * call Highlight_StatusLine("I") + au StatusLine InsertLeave * call Highlight_StatusLine("i") -au Display FocusGained,FocusLost * call ToggleCursorLine() + if has("signs") + au Signs CursorHoldI * call Highlight_Signs() + au Signs InsertEnter * call Highlight_Signs() + au Signs InsertLeave * call Highlight_Signs() + endif -if has("signs") - au Signs InsertEnter * call Highlight_Signs() - au Signs InsertLeave * call Highlight_Signs() + 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: @@ -989,10 +1473,12 @@ 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 @@ -1001,9 +1487,198 @@ let g:p4Presets='P4CONFIG' " BufExplorer. let g:bufExplorerShowRelativePath=1 let g:bufExplorerSplitOutPathName=0 + +" NERDcommenter. +let g:NERDSpaceDelims=1 + +" localvimrc. +let g:localvimrc_persistent=1 + +" Gitv. +let g:Gitv_OpenHorizontal='auto' +let g:Gitv_WipeAllOnClose=1 +endif "}}}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 Undotree window with \g. +call Mapping("g", ":UndotreeToggle") +" Switch to Undotree window with \G. +call Mapping("g", ":UndotreeToggle") +" Undotree gets focus. +let g:undotree_SetFocusWhenToggle=1 +" Undotree uses context diff. +let g:undotree_DiffCommand="diff -u" +" Undotree bullet. +if Has_Unicode() + let g:undotree_TreeNodeShape="•" +endif +" Undotree bindings emulate Gundo. +fun! g:Undotree_CustomMap() "{{{2 + nmap k UndotreeGoNextState + nmap j UndotreeGoPreviousState + nmap K UndotreeGoNextSaved + nmap J UndotreeGoPreviousSaved + nmap UndotreeFocusTarget +endfun "}}}2 + + +" 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