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

diff --git a/.vimrc b/.vimrc
index c2705ed..29b0b6d 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)
@@ -885,13 +884,13 @@ fun! <SID>Highlight_Signs(...) "{{{2
   let l:sign = ""
   let l:i = 0
   while strlen(l:signs)
-    let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+')
+    let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+')
 
-    let l:name = substitute(l:sign, '[:.=-].*', "", "")
+    let l:name = substitute(l:sign, '[:.=>-].*', "", "")
     let l:var = tolower(l:name)
     let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "")
     let l:ascii = matchstr(l:sign, '^:.')
-    let l:mark = substitute(l:sign, '^\(:.\)*[.=-]', "", "")
+    let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "")
     if strlen(l:ascii)
       let l:ascii = substitute(l:ascii, '^:', "", "")
     else
@@ -899,8 +898,14 @@ fun! <SID>Highlight_Signs(...) "{{{2
     endif
     let l:ascii = substitute(l:ascii, '"', '\\"', "")
 
+    if l:ascii == "o"
+      let l:line = "."
+    else
+      let l:line = "'" . l:ascii
+    endif
+
     call <SID>Prep_Sign(l:var)
-    exe "let " . l:var . " = <SID>Place_Sign(" . l:i . ", line(\"'" . l:ascii . "\"), b:sign" . l:var . ", \"Mark" . l:name . "\")"
+    exe "let " . l:var . " = <SID>Place_Sign(" . l:i . ", line(\"" . l:line . "\"), b:sign" . l:var . ", \"Mark" . l:name . "\")"
     let l:i = l:i + 1
 
     let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "")
@@ -925,13 +930,14 @@ fun! <SID>Cycle_Signs(resize) "{{{2
     " Signs with Type '=' will be highlighted with the MarkSign group.
     " Signs with Type '-' will be highlighted with the MarkLine group.
     " Signs with Type '.' will be highlighted with the MarkDot group.
+    " Signs with Type '>' will be highlighted with the MarkArrow group.
     " 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 = "Dash:'=’ Dot:..• Quote:\"=” Caret:^.ʌ"
+      let g:iainsigns = g:iainsigns . " Quote:\"=” Dash:'=’ Caret:^.ʌ Dot:..• Cursor:o>▶"
     else
-      let g:iainsigns = "Dash=' Dot:..* Quote=\" Caret.^"
+      let g:iainsigns = g:iainsigns . " Quote=\" Dash=' Caret.^ Dot:..* Cursor>o "
     endif
-    let g:iainsigns = 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"
   endif
 
   if g:marksigns
@@ -940,12 +946,12 @@ fun! <SID>Cycle_Signs(resize) "{{{2
     let l:signs = g:iainsigns
     let l:sign = ""
     while strlen(l:signs)
-      let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+')
+      let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+')
 
-      let l:name = substitute(l:sign, '[:.=-].*', "", "")
+      let l:name = substitute(l:sign, '[:.=>-].*', "", "")
       let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "")
       let l:ascii = matchstr(l:sign, '^:.')
-      let l:mark = substitute(l:sign, '^\(:.\)*[.=-]', "", "")
+      let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "")
       if strlen(l:ascii)
         let l:ascii = substitute(l:ascii, '^:', "", "")
         let l:ascii = matchstr(l:ascii, '^.')
@@ -963,6 +969,8 @@ fun! <SID>Cycle_Signs(resize) "{{{2
         let l:hl = "texthl=MarkDot text="
       elseif l:type == "-"
         let l:hl = "texthl=MarkLine text="
+      elseif l:type == ">"
+        let l:hl = "texthl=MarkArrow text="
       endif
 
       exe "sign define Mark" . l:name . " " . l:hl . l:mark
@@ -1175,22 +1183,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
@@ -1242,11 +1234,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
@@ -1442,6 +1431,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