X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=b2b4a635c5fcb0a8b8cafae0da4c2f416b834147;hp=48a2cf2530cfd0f2dd8d3b56d1071c6337067af2;hb=819bb88d5a014a23150b8fd609d194e883958674;hpb=9b031e4cfec3afab6531b784af528a3eb083b8e2

diff --git a/.vimrc b/.vimrc
index 48a2cf2..b2b4a63 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,4 @@
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" $Id$
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Multi-version vimrc compatible with version 4 and above.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
@@ -101,6 +99,9 @@ se t_WS=[8;%p1%d;%p2%dt
 " Highlight search results.
 se hlsearch
 
+" Set graphical window title.
+se titlestring=%{Show_TitleString()}
+
 " Syntax highlighting.  New versions will use syn enable instead.
 if version < 600
   syn on
@@ -174,6 +175,16 @@ fun! Show_Paste()
   endif
 endfun
 
+" Show the window title.
+fun! Show_TitleString()
+  if bufname("") == ""
+    let ts1='Vim'
+  else
+    let ts1=printf("%2d: %s", bufnr(""), expand('%t'))
+  endif
+  return printf("%s (%s) %s", ts1, getcwd(), v:servername)
+endfun
+
 " Show the status line.
 fun! Show_StatusLine()
   call Iain_Vars()
@@ -224,7 +235,7 @@ call Show_StatusLine()
 
 " Function to create mappings with either a hardcoded \ or <Leader>.
 fun! Mapping(keysequence,mapping)
-  if version >= "600"
+  if version < "600"
     exec "map \\" . a:keysequence . " " . a:mapping
   else
     exec "map <Leader>" . a:keysequence . " " . a:mapping
@@ -391,19 +402,21 @@ fun! Highlight_StatusLine(flag)
     if b:iainstatus =~# "I"
       " Held in insert mode.  Add extra highlight if we don't have focus.
       if b:iainstatus =~# "f"
-        let s:colour = "darkmagenta"
-      else
         let s:colour = "darkred"
+        let s:term88colour = "32"
+        let s:term256colour = "88"
+      else
+        let s:colour = "darkmagenta"
+        let s:term88colour = "33"
+        let s:term256colour = "90"
       endif
-      let s:term88colour = "32"
-      let s:term256colour = "88"
     endif
   else
     if b:iainstatus =~# "I"
       " Regular insert mode.
-      let s:colour = "darkred"
-      let s:term88colour = "32"
-      let s:term256colour = "88"
+      let s:colour = "darkmagenta"
+      let s:term88colour = "33"
+      let s:term256colour = "90"
     endif
   endif
 
@@ -442,4 +455,13 @@ se numberwidth=5
 
 " Add "previous tab" mapping as gb.
 map gb :tabPrev<CR>
+
+" Transparency.
+if has("gui_macvim")
+  se transparency=15
+endif 
+
+" Perforce.
+let g:p4EnableMenu=1
+let g:p4Presets='P4CONFIG'
 endif