.vim: change colors; fix colors for dark bg

diff --git a/.vim/colors/phd.vim b/.vim/colors/phd.vim
index ecb12da1dba0353f04d351a4b89802b4a574e2d1..939bfb406fbaf48b11d97e864cde8764b4691441 100644 (file)
--- a/.vim/colors/phd.vim
+++ b/.vim/colors/phd.vim
@@ -15,21 +15,20 @@ if !has("gui_running")
    endif
 endif
 
+highlight Constant ctermfg=brown guifg=brown
+highlight Cursor guifg=white guibg=green
+highlight pythonBuiltin cterm=bold ctermfg=blue gui=bold guifg=blue
+
 if &background == 'light'
    highlight Comment ctermfg=darkgrey guifg=grey
-   highlight Constant ctermfg=blue guifg=blue
-   highlight Cursor guifg=white guibg=green
-   highlight Function ctermfg=darkgreen guifg=darkgreen
+   highlight Function ctermfg=blue guifg=blue
    highlight Identifier ctermfg=black guifg=black
    highlight NonText ctermfg=darkgrey guifg=grey
    highlight Normal guibg=grey90
    highlight SpecialKey ctermfg=darkgrey
    highlight Statement cterm=bold ctermfg=black guifg=black
-   highlight Type ctermfg=brown guifg=brown
-   highlight pythonBuiltin ctermfg=darkgreen guifg=darkgreen
+   highlight Type ctermfg=black guifg=black
    highlight pythonExceptions ctermfg=darkred guifg=darkred
-   highlight pythonFunction ctermfg=brown guifg=brown
-   highlight pythonNumber ctermfg=darkcyan guifg=darkcyan
 
    if &diff
       highlight DiffAdd ctermfg=white ctermbg=green
@@ -37,6 +36,17 @@ if &background == 'light'
       highlight DiffText ctermfg=white ctermbg=magenta
       highlight DiffDelete ctermfg=black ctermbg=red
    endif
+
+else
+   highlight Comment ctermfg=grey guifg=grey
+   highlight Function ctermfg=cyan guifg=cyan
+   highlight Identifier ctermfg=white guifg=white
+   highlight NonText ctermfg=grey guifg=grey
+   highlight Normal guibg=white
+   highlight SpecialKey ctermfg=grey
+   highlight Statement cterm=bold ctermfg=white guifg=white
+   highlight Type ctermfg=white guifg=white
+   highlight pythonExceptions ctermfg=red guifg=red
 endif
 
 highlight SpellBad term=underline ctermfg=white ctermbg=red guifg=white guibg=red " gui=undercurl guisp=red

diff --git a/.vim/syntax/mail.vim b/.vim/syntax/mail.vim
index 4a7e5527e0e390423b4c6cdb9e96da521cf7d014..b70a53661bed29abc65d185c9544a7cfa7c8f95d 100644 (file)
--- a/.vim/syntax/mail.vim
+++ b/.vim/syntax/mail.vim
@@ -3,20 +3,27 @@ syntax match mailHeaderKey contained contains=mailHeaderEmail,mailEmail,@NoSpell
 syntax match mailSmile ' [;:]-*[dp(){}<>|\\/]\| [(){}<>\\/]-*[;:]' " :-)
 syntax match mailURL contains=@NoSpell `\v<(((https?|ftp|gopher|telnet)://|(mailto|file|news|about|ed2k|irc|sip|magnet):)[^' \t<>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' \t<>"]+)[a-z0-9/]`
 
+highlight link mailHeaderEmail Normal
+highlight mailQuoted1 cterm=NONE ctermfg=blue gui=NONE guifg=blue
+highlight mailQuoted3 cterm=NONE ctermfg=brown gui=NONE guifg=brown
+highlight mailQuoted4 cterm=NONE ctermfg=green gui=NONE guifg=green
+highlight mailQuoted5 cterm=NONE ctermfg=cyan gui=NONE guifg=cyan
+highlight mailQuoted6 cterm=NONE ctermfg=white gui=NONE guifg=white
+highlight mailURL cterm=bold ctermfg=blue gui=bold guifg=blue
+
 if &background == 'light'
    highlight Statement cterm=NONE ctermfg=black gui=NONE guifg=black
-   highlight link mailHeaderEmail Normal
    highlight mailHeaderKey cterm=bold ctermfg=black gui=bold
    highlight mailEmail cterm=bold ctermfg=darkmagenta guifg=darkmagenta gui=bold
    highlight mailSubject cterm=bold ctermfg=darkgrey gui=bold
    highlight mailSmile cterm=bold ctermfg=darkmagenta gui=bold guifg=darkmagenta
-   highlight mailQuoted1 cterm=NONE ctermfg=blue gui=NONE guifg=blue
    highlight mailQuoted2 cterm=NONE ctermfg=darkmagenta gui=NONE guifg=darkmagenta
-   highlight mailQuoted3 cterm=NONE ctermfg=brown gui=NONE guifg=brown
-   highlight mailQuoted4 cterm=NONE ctermfg=green gui=NONE guifg=green
-   highlight mailQuoted5 cterm=NONE ctermfg=cyan gui=NONE guifg=cyan
-   highlight mailQuoted6 cterm=NONE ctermfg=white gui=NONE guifg=white
-   highlight mailURL cterm=bold ctermfg=blue gui=bold guifg=blue
+
 else
-   highlight mailSmile cterm=NONE ctermfg=yellow
+   highlight Statement cterm=NONE ctermfg=white gui=NONE guifg=white
+   highlight mailHeaderKey cterm=bold ctermfg=white gui=bold
+   highlight mailEmail cterm=bold ctermfg=magenta guifg=magenta gui=bold
+   highlight mailSubject cterm=bold ctermfg=yellow gui=bold
+   highlight mailSmile cterm=bold ctermfg=magenta gui=bold guifg=magenta
+   highlight mailQuoted2 cterm=NONE ctermfg=magenta gui=NONE guifg=magenta
 endif