X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vim%2Fcolors%2Fiain.vim;h=1ceaf0519a1eb154278d1264acedd90903f9bdcb;hp=6d0d776c0ad3a2b10d624fccdc596b3a6b34be3d;hb=dc56e06ae1487dcf58183b90878d61ef71b0cfc6;hpb=b2c3929581298264f08f7a8409349fd653d489bd

diff --git a/.vim/colors/iain.vim b/.vim/colors/iain.vim
index 6d0d776..1ceaf05 100644
--- a/.vim/colors/iain.vim
+++ b/.vim/colors/iain.vim
@@ -208,9 +208,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
 
     " sets the highlighting for the given group
     fun! <SID>X(group, fg, bg, attr)
+        " Our dark grey ends up being too light when Vim is run inside screen
+        " on an 88-colour urxvt.
+        let l:hackgrey = "#303030"
+        let l:hackterm = "^screen-256color"
+        let l:hackbad = 235
+        let l:hackgood = 234
         if a:fg != ""
             if a:fg =~ '^#'
                 let l:fg = <SID>rgb(substitute(a:fg, '^#', '', ''))
+                if a:fg == l:hackgrey && &term =~ l:hackterm && l:fg == l:hackbad
+                  let l:fg = l:hackgood
+                endif
             else
                 let l:fg=a:fg
             endif
@@ -219,6 +228,9 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
         if a:bg != ""
             if a:bg =~ '^#'
                 let l:bg = <SID>rgb(substitute(a:bg, '^#', '', ''))
+                if a:bg == l:hackgrey && &term =~ l:hackterm && l:bg == l:hackbad
+                  let l:bg = l:hackgood
+                endif
             else
                 let l:bg=a:bg
             endif
@@ -268,7 +280,8 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     hi def Normal guifg=#c0c0c0 guibg=#000020
 
     call <SID>X("StatusLineNC", "black", "#808080", "none")
-    call <SID>X("StatusLine", "white", "#000080", "bold")
+    call <SID>X("StatusLine", "white", "#000080", "none")
+    call <SID>X("User1", "white", "#000080", "bold")
     call <SID>X("WildMenu", "blue", "white", "bold")
     call <SID>X("Todo", "black", "green", "bold")
     call <SID>X("MoreMsg", "#00ff00", "", "none")
@@ -330,6 +343,17 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     hi link treeClosable treeDirSlash
     hi link treePart treeDirSlash
     hi link treePartFile treeDirSlash
+
+    " Fix up BufExplorer stuff.
+    hi link bufExplorerHelp String
+    hi link bufExplorerSortBy Statement
+    hi link bufExplorerMapping Identifier
+    hi link bufExplorerTitle Statement
+    hi link bufExplorerActBuf Directory
+    hi link bufExplorerAltBuf String
+    hi link bufExplorerCurBuf Type
+    hi link bufExplorerUnlBuf Comment
+    hi link bufExplorerBufNbr Normal
 endif
 
 " vim: set fdl=0 fdm=marker: