Colour tidyup.

[profile.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 15a6414..7ac76ec 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -375,28 +375,23 @@ filetype indent on
 " Less intrusive syntax highlighting.
 syn enable
 
-" Nice GUI colour.
+" Set colours.
 if has("gui_running")
-  se guifont=DejaVu\ Sans\ Mono\ 10
-  " XXX: Sort this out.
-  colo darkblue
-  hi Cursor guibg=green
-  hi LineNr guibg=#303030
-  hi MarkLine guibg=#2e2e2e
-  hi MarkDot guifg=red guibg=#2e2e2e
-  hi MarkSign guifg=lightblue guibg=#2e2e2e
-  hi! link SignColumn LineNr
-elseif &t_Co > 16
   try
-    colo iain
+    if has("win32")
+      se guifont=DejaVu_Sans_Mono:h10:cANSI
+    else
+      se guifont=DejaVu\ Sans\ Mono\ 10
+    endif
   catch
   endtry
 endif
-if has("win32")
-  se guifont=DejaVu_Sans_Mono:h10:cANSI
+if has("gui_running") || &t_Co > 16
+  try
+    colo iain
+  catch
+  endtry
 endif
-hi! link TabLineSel StatusLine
-hi! link TabLine StatusLineNC
 
 " Ignore whitespace when diffing.
 se diffopt=filler,iwhite
@@ -736,7 +731,7 @@ fun! Highlight_StatusLine(flag)
 
   let l:termcolour = <SID>Iain_Colour(l:colour)
 
-  exec "highlight StatusLine guifg=white guibg=" . l:colour . " ctermbg=white ctermfg=" . l:termcolour
+  exec "highlight StatusLine guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour
 endfun
 
 au Display VimEnter * call Highlight_StatusLine("")