X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=188697127217e2eddf34bd5831b2ae72c049b861;hp=4e2d8e6f0ddc09d850b7ac4695bf893ef5300784;hb=a35e8ca463e14772e3634291187553567bdc77f1;hpb=72d6f96aedcd0d5ff3d503b9284dd1dfe6af7d38 diff --git a/.vimrc b/.vimrc index 4e2d8e6..1886971 100644 --- a/.vimrc +++ b/.vimrc @@ -2,16 +2,16 @@ " 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. @@ -75,6 +75,10 @@ inoremap " Swap jump keys. noremap ' ` noremap ` ' + +" Select previous widnow. +noremap ^ p +noremap p "}}}1 " Find stuff. @@ -320,7 +324,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 "" @@ -614,6 +618,33 @@ endif "}}}1 if version >= "504" "{{{1 version 5.4 +" Reuse windows when using sbuffer. +se switchbuf=useopen + +" 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 space, underscore or dollar sign depending on list mode. fun! Show_List() "{{{2 @@ -621,7 +652,7 @@ fun! Show_List() "{{{2 if w:iainlist == 0 " No list. return " " - elseif Has_Unicode() + elseif Has_Unicode() if w:iainlist == 1 " Just tabs. return "»" @@ -665,6 +696,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 +740,35 @@ 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 + " 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' + 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' @@ -847,7 +916,7 @@ fun! Cycle_Signs(resize) "{{{2 " Signs with Type '-' will be highlighted with the MarkLine group. " Signs with Type '.' will be highlighted with the MarkDot group. " Define the Mark where Symbol is not also the mark name, eg "']". - if Has_Unicode() + if Has_Unicode() let g:iainsigns = "Dash:'=’ Dot:..• Quote:\"=” Caret:^.ʌ" else let g:iainsigns = "Dash=' Dot:..* Quote=\" Caret.^" @@ -900,31 +969,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 +1001,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 +1038,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. @@ -1091,12 +1145,15 @@ endfun "}}}2 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 + 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 @@ -1184,7 +1241,7 @@ map gb :tabprevious: " Transparency. if has("gui_macvim") se transparency=15 -endif +endif " Yet more GUI options. Add tabs. if has("gui") @@ -1203,6 +1260,58 @@ let g:bufExplorerSplitOutPathName=0 let g:NERDSpaceDelims=1 endif "}}}1 +" localvimrc. +let g:localvimrc_persistent=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. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -1284,6 +1393,10 @@ 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 endif "}}}1