X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=bc459b3b6566b1b8eb6e3bd6e499c1a931bb4a0b;hp=06f749b23b715c47cd6346432a3f8611d9cefe28;hb=5dc7815f5686ea5032214933fcd6740e875ce1af;hpb=d643f35d55b8c3ddf1ba3ebf5206267a74cd7652 diff --git a/.vimrc b/.vimrc index 06f749b..bc459b3 100644 --- a/.vimrc +++ b/.vimrc @@ -1,17 +1,17 @@ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" 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. @@ -67,14 +67,21 @@ 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. @@ -205,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) @@ -320,7 +326,7 @@ 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 "" @@ -539,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. @@ -580,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" @@ -590,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 @@ -614,14 +635,89 @@ endif "}}}1 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() + return "" + elseif Has_Unicode() if w:iainlist == 1 " Just tabs. return "»" @@ -665,6 +761,23 @@ fun! Show_Paste() "{{{2 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 @@ -692,14 +805,106 @@ fun! Show_Alt() "{{{2 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 + " 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_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_Undo()}%Y%M%R]%{Show_Alt()}\ ' - let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%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_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' @@ -724,7 +929,7 @@ endif "}}}1 if version >= "600" "{{{1 version 6.0 -if has("gui_win32") +if has("win32") || has("win64") se encoding=utf-8 endif @@ -738,7 +943,14 @@ filetype indent on " Less intrusive syntax highlighting. if has("syntax") - syn enable + " 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. @@ -806,13 +1018,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 @@ -820,8 +1032,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, '^[^ ]\+ *', "", "") @@ -846,13 +1064,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 @@ -861,14 +1086,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 linehl=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 @@ -900,31 +1145,10 @@ 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() + if Has_Unicode() let basic='tab:»·,trail:…,extends:«,precedes:»' let eol='eol:¶' if version >= "700" @@ -953,6 +1177,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. @@ -989,6 +1214,11 @@ fun! Cycle_Alt() "{{{2 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. @@ -1011,6 +1241,12 @@ if has("autocmd") " Show signs by default. au Display VimEnter * call Cycle_Signs(0) endif + +" move. +nmap MoveLineHalfPageUp +nmap MoveLineHalfPageDown +vmap MoveBlockHalfPageUp +vmap MoveBlockHalfPageDown endif "}}}1 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -1087,19 +1323,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 =~# "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 - endif -endfun "}}}2 - " Handle searching in a BufExplorer window. fun! BufExplorer_Search(n) "{{{2 if a:n == 0 @@ -1149,13 +1372,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 @@ -1184,7 +1405,7 @@ map gb :tabprevious: " Transparency. if has("gui_macvim") se transparency=15 -endif +endif " Yet more GUI options. Add tabs. if has("gui") @@ -1198,6 +1419,65 @@ 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 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -1211,6 +1491,9 @@ 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("%"))) @@ -1281,7 +1564,29 @@ 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.