More concise statusline.

git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@20 6be0d1a5-5cfe-0310-89b6-964be062b18b

diff --git a/.vimrc b/.vimrc
index 945cb32..6400b45 100755 (executable)
--- a/.vimrc
+++ b/.vimrc
@@ -51,13 +51,13 @@ fun Show_List()
   call Iain_Vars()
   if b:iainlist == 0
     " No list.
-    return "  "
+    return " "
   elseif b:iainlist == 1
     " Just tabs.
-    return "\\_"
+    return "_"
   else
     " Full list.
-    return "\.\$"
+    return "\$"
   endif
 endfun
 
@@ -66,9 +66,9 @@ fun Cycle_StatusLine()
   call Iain_Vars()
   let b:iainhex = ! b:iainhex
   if b:iainhex
-    set statusline=%2n\:\ %<%f\ [%{Show_List()}][%{Show_Case()}]%y%m%r\ %=0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}]%y%m%r\ %=0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P
   else
-    set statusline=%2n\:\ %<%f\ [%{Show_List()}][%{Show_Case()}]%y%m%r\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}]%y%m%r\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P
   endif
 endfun
 
@@ -91,7 +91,11 @@ fun Invert_Case()
 endfun
 
 fun Show_Case()
-  if &ic | return "ca" | else | return "Ca" | endif
+  if &ic | return "c" | else | return "C" | endif
+endfun
+
+fun Show_Tabstop()
+  return &ts
 endfun
 
 " Swap hex/decimal statusline with ,x