X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=88ef3728d47685c7526138f65306f96844e37707;hb=1052b067706dd242df58ca06e62c8f819a5d131f;hp=29b0b6d727813fb73df1eef8804b02d4f938821e;hpb=546a2177e8c7dcda6895b25c5f4b0f6e83707e1d;p=profile.git

diff --git a/.vimrc b/.vimrc
index 29b0b6d..88ef372 100644
--- a/.vimrc
+++ b/.vimrc
@@ -545,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.
@@ -586,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"
@@ -596,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
@@ -647,13 +662,38 @@ fun! Has_Unicode() "{{{2
   return 0
 endfun "}}}2
 
+" Helper for status line.
+" Show file encoding
+func! Show_Encoding() "{{{2
+  let l:enc = &fenc
+  if l:enc == ""
+    let l:enc = &enc
+    if l:enc == ""
+      return ""
+    endif
+    let l:enc = '(' . l:enc . ')'
+  endif
+
+  if has("multi_byte")
+    if &bomb
+      if Has_Unicode()
+        let l:enc = l:enc . "☻"
+      else
+        let l:enc = l:enc . "@"
+      endif
+    endif
+  endif
+
+  return 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.
@@ -763,13 +803,28 @@ 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
+
 " 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:sl1='%2n\:\ %<%1*%f%0*\ [%{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='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%V%0*\ \|\ %P'
   let l:hexformat='%b'
   if b:iainhex
@@ -934,9 +989,15 @@ fun! <SID>Cycle_Signs(resize) "{{{2
     " 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:..• Cursor:o>▶"
+      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:..* Cursor>o "
+      let g:iainsigns = g:iainsigns . " Quote=\" Dash=' Caret.^ Dot:..*"
+      if version < "704"
+        let g:iainsigns = g:iainsigns ." Cursor>o"
+      endif
     endif
   endif
 
@@ -1232,6 +1293,7 @@ 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("signs")
@@ -1286,6 +1348,10 @@ endif "}}}1
 " localvimrc.
 let g:localvimrc_persistent=1
 
+" Gitv.
+let g:Gitv_OpenHorizontal='auto'
+let g:Gitv_WipeAllOnClose=1
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Handle options only available in Vim 7.2 and above.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""