Colour tweaks.

Added colours for NERD_tree.
256-colour LineNr and friends were too dark.
StatusLine and StatusLineNC weren't consistent.
Moved MatchParen highlighting into the colourscheme.

diff --git a/.vim/colors/iain.vim b/.vim/colors/iain.vim
index b49812a..29a6c91 100644 (file)
--- a/.vim/colors/iain.vim
+++ b/.vim/colors/iain.vim
@@ -237,7 +237,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     call <SID>X("Search", "#ffffff", "#2050d0", "")
     call <SID>X("IncSearch", "#b0ffff", "#2050d0", "")
     "call <SID>X("SpecialKey", "#00ffff", "", "")
-    call <SID>X("Directory", "#00ffff", "", "")
+    call <SID>X("Directory", "#008bff", "", "")
     call <SID>X("Title", "#ff00ff", "", "none")
     call <SID>X("WarningMsg", "#ff0000", "", "")
     "call <SID>X("WildMenu", "#ffff00", "#000000", "")
@@ -245,14 +245,15 @@ 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("Folded", "#808080", "#202020", "")
-    call <SID>X("FoldColumn", "#808080", "#202020", "")
-    call <SID>X("LineNr", "#90f020", "#202020", "")
+    call <SID>X("Folded", "#808080", "#303030", "")
+    call <SID>X("FoldColumn", "#808080", "#303030", "")
+    call <SID>X("LineNr", "#90f020", "#303030", "")
     call <SID>X("DiffAdd", "#00008b", "", "")
     call <SID>X("DiffChange", "#8b008b", "", "")
     call <SID>X("DiffDelete", "#0000ff", "#008b8b", "bold")
     call <SID>X("DiffText", "", "#ff0000", "bold")
     call <SID>X("Cursor", "#000000", "#00ff00", "")
+    call <SID>X("CursorLine", "", "#2e2e2e", "none")
     call <SID>X("lCursor", "#000000", "#ffffff", "")
     "call <SID>X("Comment", "#80a0ff", "", "")
     "call <SID>X("Constant", "#ffa0a0", "", "")
@@ -267,7 +268,7 @@ 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", "darkblue", "#808080", "none")
+    call <SID>X("StatusLine", "white", "#000080", "bold")
     call <SID>X("WildMenu", "blue", "white", "bold")
     call <SID>X("Todo", "black", "green", "bold")
     call <SID>X("MoreMsg", "#00ff00", "", "none")
@@ -281,6 +282,8 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     hi! link TabLineSel StatusLine
     hi! link TabLine StatusLineNC
 
+    hi MatchParen ctermbg=blue
+
     call <SID>X("Pmenu", "#ffffff", "#287eff", "")
 
     hi Comment ctermfg=lightblue cterm=none guifg=#80a0ff gui=none
@@ -315,10 +318,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     " Fix up Perl stuff.
 
     " Signs to highlight marks.
-    call <SID>X("MarkLine", "", "#202020", "")
-    call <SID>X("MarkDot", "red", "#202020", "")
-    call <SID>X("MarkSign", "lightblue", "#202020", "")
+    call <SID>X("MarkLine", "", "#303030", "")
+    call <SID>X("MarkDot", "red", "#303030", "")
+    call <SID>X("MarkSign", "lightblue", "#303030", "")
     hi! link SignColumn LineNr
+
+    " Fix up NERDTree stuff.
+    hi link treeExecFile Type
+    hi treeLink cterm=none ctermfg=cyan gui=none guifg=cyan
+    hi link treeOpenable treeDirSlash
+    hi link treeClosable treeDirSlash
+    hi link treePart treeDirSlash
+    hi link treePartFile treeDirSlash
 endif
 
 " vim: set fdl=0 fdm=marker:

diff --git a/.vimrc b/.vimrc
index 9f8f25a..b834702 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -130,10 +130,6 @@ if version < "600"
   syn on
 endif
 
-" Use a discernably different colour to highlight the cursor which shows 
-" matching brackets.  Our regular cursor is green so use blue instead of cyan.
-hi MatchParen ctermbg=blue
-
 " Catch typos.
 command! W :w
 command! Wq :wq