X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=7f1a8f7c548a7286fa2c4edebe891c1bf72f485e;hp=b15c78f45aac85495297caf7a1e28cc3b2a84bd1;hb=3f8b98868d60cd8c7ef15b31d7fcbd545ced7b11;hpb=41845218c2dd24eea1c07a52a8ffb16abe8da2b6

diff --git a/.vimrc b/.vimrc
index b15c78f..7f1a8f7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -212,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)
@@ -935,9 +934,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
 
@@ -1184,22 +1189,6 @@ fun! Show_GUITabLine() "{{{2
   return l:s
 endfun "}}}2
 
-" Toggle highlighting cursor line when focus changes.
-fun! <SID>ToggleCursorLine() "{{{2
-  call Iain_Vars()
-
-  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
-
 " Handle searching in a BufExplorer window.
 fun! <SID>BufExplorer_Search(n) "{{{2
   if a:n == 0
@@ -1251,11 +1240,8 @@ if has("autocmd")
   au StatusLine InsertEnter * call Highlight_StatusLine("I")
   au StatusLine InsertLeave * call Highlight_StatusLine("i")
 
-  if has("syntax")
-    au Display FocusGained,FocusLost * call <SID>ToggleCursorLine()
-  endif
-
   if has("signs")
+    au Signs CursorHoldI * call <SID>Highlight_Signs()
     au Signs InsertEnter * call <SID>Highlight_Signs()
     au Signs InsertLeave * call <SID>Highlight_Signs()
   endif
@@ -1306,6 +1292,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.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -1451,6 +1441,18 @@ if has("autocmd")
 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.
 if version >= "500" "{{{1