X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=3d83fbd3eba21199d0740ad7daa7899f747290f7;hb=a8f817805f18dcdd95129a654d209883ab7758f8;hp=03862f6ded795d4a96bb0492e6ace19ef5b6a2d1;hpb=24d37da439aa2f6ff09e5fec9c5bf1d699dd4b69;p=profile.git

diff --git a/.vimrc b/.vimrc
index 03862f6..3d83fbd 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 <condition> | 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 <condition> | 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.
@@ -320,7 +320,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 +614,9 @@ endif "}}}1
 if version >= "504" "{{{1
 version 5.4
 
+" Reuse windows when using sbuffer.
+se switchbuf=useopen
+
 " Do we have Unicode?
 fun! Has_Unicode() "{{{2
   if ! has('multi_byte')
@@ -695,7 +698,7 @@ fun! Show_VirtualEdit() "{{{2
 
   if &ve == "all"
     return "V"
-  elseif &ve
+  elseif &ve != ''
     return "v"
   else
     return ""
@@ -758,7 +761,7 @@ fun! Show_StatusLine() "{{{2
   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%0*\ \|\ %P'
+  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'
@@ -991,6 +994,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.
@@ -1027,6 +1031,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()<CR>:<CR>")
 " Change statusline verbosity with \v.
@@ -1129,12 +1138,15 @@ endfun "}}}2
 fun! <SID>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
 
@@ -1222,7 +1234,7 @@ map gb :tabprevious<CR>:<CR>
 " Transparency.
 if has("gui_macvim")
   se transparency=15
-endif 
+endif
 
 " Yet more GUI options.  Add tabs.
 if has("gui")
@@ -1242,6 +1254,55 @@ let g:NERDSpaceDelims=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\+            <whitespace>
+    "            $    <before end of line>
+    "        \@<!     <unless preceded by>
+    "     \%#         <cursor position, ie when typing>
+    let l:pattern = '\s\+\%#\@<!$'
+    " Don't match single space in first column of diff.
+    if &ft =~# '^diff$\|git'
+      "         \@!  <unless also matching>
+      " \(^\s$\)     <a single whitespace>
+      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