Colour tidyup.

Use iain scheme even in gvim.
Use a darker background for gvim.
Use darker background for LineNr and folds.
Highlight StatusLine in a sensible way.

diff --git a/.vim/colors/iain.vim b/.vim/colors/iain.vim
index 0fb251c..b49812a 100644 (file)
--- a/.vim/colors/iain.vim
+++ b/.vim/colors/iain.vim
@@ -245,9 +245,9 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     call <SID>X("Question", "#00ff00", "", "none")
     "call <SID>X("NonText", "#0030ff", "", "")
     call <SID>X("VertSplit", "#000000", "#808080", "none")
     call <SID>X("Question", "#00ff00", "", "none")
     "call <SID>X("NonText", "#0030ff", "", "")
     call <SID>X("VertSplit", "#000000", "#808080", "none")

-    call <SID>X("Folded", "#808080", "#000040", "")
-    call <SID>X("FoldColumn", "#808080", "#000040", "")
-    call <SID>X("LineNr", "#90f020", "#303030", "")
+    call <SID>X("Folded", "#808080", "#202020", "")
+    call <SID>X("FoldColumn", "#808080", "#202020", "")
+    call <SID>X("LineNr", "#90f020", "#202020", "")

     call <SID>X("DiffAdd", "#00008b", "", "")
     call <SID>X("DiffChange", "#8b008b", "", "")
     call <SID>X("DiffDelete", "#0000ff", "#008b8b", "bold")
     call <SID>X("DiffAdd", "#00008b", "", "")
     call <SID>X("DiffChange", "#8b008b", "", "")
     call <SID>X("DiffDelete", "#0000ff", "#008b8b", "bold")


@@ -264,7 +264,10 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     call <SID>X("Ignore", "#ffffff", "", "")
 
     " My stuff.
     call <SID>X("Ignore", "#ffffff", "", "")
 
     " My stuff.

+    hi def Normal guifg=#c0c0c0 guibg=#000020
+

     call <SID>X("StatusLineNC", "black", "#808080", "none")
     call <SID>X("StatusLineNC", "black", "#808080", "none")

+    call <SID>X("StatusLine", "darkblue", "#808080", "none")

     call <SID>X("WildMenu", "blue", "white", "bold")
     call <SID>X("Todo", "black", "green", "bold")
     call <SID>X("MoreMsg", "#00ff00", "", "none")
     call <SID>X("WildMenu", "blue", "white", "bold")
     call <SID>X("Todo", "black", "green", "bold")
     call <SID>X("MoreMsg", "#00ff00", "", "none")


@@ -275,6 +278,9 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     call <SID>X("Operator", "#e0e000", "", "none")
     call <SID>X("Statement", "#ffff00", "", "none")
 
     call <SID>X("Operator", "#e0e000", "", "none")
     call <SID>X("Statement", "#ffff00", "", "none")
 

+    hi! link TabLineSel StatusLine
+    hi! link TabLine StatusLineNC
+

     call <SID>X("Pmenu", "#ffffff", "#287eff", "")
 
     hi Comment ctermfg=lightblue cterm=none guifg=#80a0ff gui=none
     call <SID>X("Pmenu", "#ffffff", "#287eff", "")
 
     hi Comment ctermfg=lightblue cterm=none guifg=#80a0ff gui=none


@@ -309,9 +315,9 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     " Fix up Perl stuff.
 
     " Signs to highlight marks.
     " Fix up Perl stuff.
 
     " Signs to highlight marks.

-    call <SID>X("MarkLine", "", "#2e2e2e", "")
-    call <SID>X("MarkDot", "red", "#2e2e2e", "")
-    call <SID>X("MarkSign", "lightblue", "#2e2e2e", "")
+    call <SID>X("MarkLine", "", "#202020", "")
+    call <SID>X("MarkDot", "red", "#202020", "")
+    call <SID>X("MarkSign", "lightblue", "#202020", "")

     hi! link SignColumn LineNr
 endif
 
     hi! link SignColumn LineNr
 endif
 

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
 
 " Less intrusive syntax highlighting.
 syn enable
 

-" Nice GUI colour.
+" Set colours.

 if has("gui_running")
 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
   try

-    colo iain
+    if has("win32")
+      se guifont=DejaVu_Sans_Mono:h10:cANSI
+    else
+      se guifont=DejaVu\ Sans\ Mono\ 10
+    endif

   catch
   endtry
 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
 endif

-hi! link TabLineSel StatusLine
-hi! link TabLine StatusLineNC

 
 " Ignore whitespace when diffing.
 se diffopt=filler,iwhite
 
 " Ignore whitespace when diffing.
 se diffopt=filler,iwhite


@@ -736,7 +731,7 @@ fun! Highlight_StatusLine(flag)
 
   let l:termcolour = <SID>Iain_Colour(l:colour)
 
 
   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("")
 endfun
 
 au Display VimEnter * call Highlight_StatusLine("")