X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=8c8f8f980942df0bd23b017e2cc0d88730c203f1;hp=6de80384ae9abb53072a734ba3db203ea2c2facd;hb=818d30c4f33a7609b216b4ca4b34bf82a788d5d2;hpb=210a297d59649b72776feaae4b318945f7ad4074 diff --git a/.vimrc b/.vimrc index 6de8038..8c8f8f9 100644 --- a/.vimrc +++ b/.vimrc @@ -1,5 +1,5 @@ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" 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 @@ -212,7 +212,6 @@ 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) @@ -428,39 +427,39 @@ endfun "}}}2 " Function to create mappings with either a hardcoded \ or . fun! Mapping(keysequence,mapping) "{{{2 if version < "600" - exec "map \\" . a:keysequence . " " . a:mapping + exec "map \\" . a:keysequence . " " . a:mapping . ":" else - exec "map " . a:keysequence . " " . a:mapping + exec "map " . a:keysequence . " " . a:mapping 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 @/=''") + +" Set 2-column tabs with \2. +call Mapping("2", ":se ts=2:se sw=2") +" Set 4-column tabs with \4. +call Mapping("4", ":se ts=4:se sw=4") +" Set 8-column tabs with \8. +call Mapping("8", ":se ts=8:se sw=8") +" Set 16-column tabs with \6. +call Mapping("6", ":se ts=16:se sw=16") +" Set 32-column tabs with \3. +call Mapping("3", ":se ts=32:se sw=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():") +call Mapping("#", ":call Cycle_Alt()") " Set graphical window title. if has("win32") || has("win64") @@ -546,9 +545,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. @@ -587,6 +593,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" @@ -597,12 +605,18 @@ 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 @@ -624,6 +638,11 @@ 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+=! @@ -648,13 +667,56 @@ fun! Has_Unicode() "{{{2 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 " " + return "" elseif Has_Unicode() if w:iainlist == 1 " Just tabs. @@ -682,6 +744,15 @@ fun! Show_Case() "{{{2 endif endfun "}}}2 +" 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 @@ -764,14 +835,85 @@ fun! Show_Bind() "{{{2 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 + " 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' + + " 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_SearchForward()}]%{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' @@ -885,13 +1027,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 @@ -899,8 +1041,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, '^[^ ]\+ *', "", "") @@ -925,12 +1073,19 @@ 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 "']". 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 @@ -940,12 +1095,12 @@ 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 = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+') - let l:name = substitute(l:sign, '[:.=-].*', "", "") + 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, '^\(:.\)*[.=-]', "", "") + let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "") if strlen(l:ascii) let l:ascii = substitute(l:ascii, '^:', "", "") let l:ascii = matchstr(l:ascii, '^.') @@ -963,6 +1118,8 @@ fun! Cycle_Signs(resize) "{{{2 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 @@ -1072,34 +1229,34 @@ fun! Extra_Whitespace_Match() "{{{2 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 -endif "}}}1 " move. nmap MoveLineHalfPageUp nmap MoveLineHalfPageDown vmap MoveBlockHalfPageUp vmap MoveBlockHalfPageDown +endif "}}}1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 7 and above. @@ -1107,6 +1264,11 @@ vmap MoveBlockHalfPageDown if version >= "700" "{{{1 version 7.0 +" Narrow buffer with \w. +call Mapping("w", ":NarrowRegion") +" Narrow window with \W. +call Mapping("W", ":NarrowWindow") + " Helper to show tab name. fun! TabName(label, gui) "{{{2 let l:label = a:label @@ -1175,22 +1337,6 @@ fun! Show_GUITabLine() "{{{2 return l:s endfun "}}}2 -" Toggle highlighting cursor line when focus changes. -fun! ToggleCursorLine() "{{{2 - call Iain_Vars() - - if b:iainstatus =~# "H" && b:iainstatus =~# "I" - " We are held in insert mode. - if b:iainstatus =~# "f" - " And focus was lost. - let b:iaincul = getbufvar("", "&cursorline") - setlocal cursorline - elseif ! b:iaincul - setlocal nocursorline - endif - endif -endfun "}}}2 - " Handle searching in a BufExplorer window. fun! BufExplorer_Search(n) "{{{2 if a:n == 0 @@ -1240,13 +1386,11 @@ if has("autocmd") 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") - if has("syntax") - au Display FocusGained,FocusLost * call ToggleCursorLine() - endif - if has("signs") + au Signs CursorHoldI * call Highlight_Signs() au Signs InsertEnter * call Highlight_Signs() au Signs InsertLeave * call Highlight_Signs() endif @@ -1292,11 +1436,15 @@ 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 +endif "}}}1 + """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 7.2 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -1353,12 +1501,12 @@ if version >= "703" "{{{1 version 7.3 " Toggle persistent undo with \u. -call Mapping("u", ":call Cycle_Undo():") +call Mapping("u", ":call Cycle_Undo()") " Remove persistent undo file with \U. -call Mapping("U", ":call Clear_Undo():") +call Mapping("U", ":call Clear_Undo()") " Toggle gundo window with \g. -call Mapping("g", ":call gundo#GundoToggle():") +call Mapping("g", ":call gundo#GundoToggle()") " Use a persistent undo file if it exists. fun! Check_Undo() "{{{2 @@ -1418,11 +1566,11 @@ endfun "}}}2 if has("syntax") " Enable showing ColorColumn at cursor position with \CC. - call Mapping("CC", ":call Cycle_ColorColumn():") + call Mapping("CC", ":call Cycle_ColorColumn()") " Remove last shown ColorColumn with \Cc. - call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\"):") + call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\")") " Remove all ColorColumns with \Cx. - call Mapping("Cx", ":se colorcolumn=:") + call Mapping("Cx", ":se colorcolumn=") endif " Use persistent undo if available. @@ -1441,6 +1589,18 @@ 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.