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

diff --git a/.vimrc b/.vimrc
index 7f1a8f7..14401a6 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,14 +803,76 @@ 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
+
+" Helper for status line.
+" Show marks set in cursor line.
+fun! Show_Marks() "{{{2
+  if ! exists("g:iainsigns")
+    return ""
+  endif
+
+  let l:marks = ""
+
+  let l:signs = g:iainsigns
+  let l:sign = ""
+  let l:cursorline = line(".")
+  while strlen(l:signs)
+    let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+')
+    let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "")
+    let l:ascii = matchstr(l:sign, '^:.')
+    let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "")
+    if strlen(l:ascii)
+      let l:ascii = substitute(l:ascii, '^:', "", "")
+    else
+      let l:ascii = l:mark
+    endif
+    let l:ascii = substitute(l:ascii, '"', '\\"', "")
+
+    if l:ascii == "o"
+      let l:line = "."
+    else
+      let l:line = "'" . l:ascii
+    endif
+
+    " Ignore cursor line which will always match.
+    if l:line != "."
+      if l:cursorline == line(l:line)
+        let l:marks = l:marks . l:mark
+      endif
+    endif
+
+    let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "")
+  endwhile
+
+  if l:marks == ""
+    return ""
+  else
+    return "M:" . l:marks . " "
+  endif
+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:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%V%0*\ \|\ %P'
+  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='%{Show_Marks()}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'
@@ -1238,6 +1340,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")