Reuse windows when using sbuffer.

[profile.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 9c7457a..ce3b0ca 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -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.
@@ -1244,6 +1253,55 @@ let g:bufExplorerSplitOutPathName=0
 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.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""