X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=52bacca101cdcf7ea93fe01617ac2c42dd4473ae;hp=03862f6ded795d4a96bb0492e6ace19ef5b6a2d1;hb=08a2c3604c45a8760381f850986ad45e9aa6164f;hpb=24d37da439aa2f6ff09e5fec9c5bf1d699dd4b69

diff --git a/.vimrc b/.vimrc
index 03862f6..52bacca 100644
--- a/.vimrc
+++ b/.vimrc
@@ -695,7 +695,7 @@ fun! Show_VirtualEdit() "{{{2
 
   if &ve == "all"
     return "V"
-  elseif &ve
+  elseif &ve != ''
     return "v"
   else
     return ""
@@ -758,7 +758,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'
@@ -1129,12 +1129,15 @@ endfun "}}}2
 fun! <SID>ToggleCursorLine() "{{{2
   call Iain_Vars()
 
-  if b:iainstatus =~# "f" && b:iainstatus =~# "H" && b:iainstatus =~# "I"
-    " Focus lost while held in insert mode.
-    let b:iaincul = getbufvar("", "&cursorline")
-    setlocal cursorline
-  elseif ! b:iaincul
-    setlocal nocursorline
+  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