.vim: change colors

diff --git a/.vim/colors/phd.vim b/.vim/colors/phd.vim
index 939bfb406fbaf48b11d97e864cde8764b4691441..e4d086cc90bb074a3682fe805552e6beda5a3325 100644 (file)
--- a/.vim/colors/phd.vim
+++ b/.vim/colors/phd.vim
@@ -6,8 +6,8 @@ let g:colors_name = "phd"
 
 if !has("gui_running")
    if &background == 'light'
-      highlight MoreMsg cterm=bold ctermfg=NONE
-      highlight Question cterm=bold ctermfg=NONE
+      highlight MoreMsg cterm=bold ctermfg=none
+      highlight Question cterm=bold ctermfg=none
    else
       highlight MoreMsg ctermfg=white
       highlight ModeMsg ctermfg=white
@@ -15,14 +15,24 @@ if !has("gui_running")
    endif
 endif
 
-highlight Constant ctermfg=brown guifg=brown
+highlight Constant ctermfg=blue guifg=blue
 highlight Cursor guifg=white guibg=green
 highlight pythonBuiltin cterm=bold ctermfg=blue gui=bold guifg=blue
+highlight pythonNumber ctermfg=brown guifg=brown
+
+if &filetype == 'mail'
+   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
+endif
 
 if &background == 'light'
    highlight Comment ctermfg=darkgrey guifg=grey
-   highlight Function ctermfg=blue guifg=blue
-   highlight Identifier ctermfg=black guifg=black
+   highlight Identifier ctermfg=darkgreen guifg=green
    highlight NonText ctermfg=darkgrey guifg=grey
    highlight Normal guibg=grey90
    highlight SpecialKey ctermfg=darkgrey
@@ -30,23 +40,47 @@ if &background == 'light'
    highlight Type ctermfg=black guifg=black
    highlight pythonExceptions ctermfg=darkred guifg=darkred
 
-   if &diff
-      highlight DiffAdd ctermfg=white ctermbg=green
-      highlight DiffChange ctermfg=black ctermbg=cyan
-      highlight DiffText ctermfg=white ctermbg=magenta
-      highlight DiffDelete ctermfg=black ctermbg=red
+   if &filetype == 'mail'
+      highlight Statement cterm=none ctermfg=black gui=none guifg=black
+      highlight Type ctermfg=blue guifg=blue
+      highlight mailEmail cterm=bold ctermfg=darkmagenta guifg=darkmagenta gui=bold
+      highlight mailQuoted2 cterm=none ctermfg=darkmagenta gui=none guifg=darkmagenta
+      highlight mailSmile cterm=bold ctermfg=darkmagenta gui=bold guifg=darkmagenta
+      highlight mailSubject cterm=bold ctermfg=darkgrey gui=bold
+   endif
+
+   if &filetype == 'xml'
+      highlight clear Identifier
+      highlight link Identifier Statement
    endif
 
 else
    highlight Comment ctermfg=grey guifg=grey
-   highlight Function ctermfg=cyan guifg=cyan
-   highlight Identifier ctermfg=white guifg=white
+   highlight Identifier ctermfg=green guifg=green
    highlight NonText ctermfg=grey guifg=grey
-   highlight Normal guibg=white
+   highlight Normal guibg=black
    highlight SpecialKey ctermfg=grey
    highlight Statement cterm=bold ctermfg=white guifg=white
    highlight Type ctermfg=white guifg=white
    highlight pythonExceptions ctermfg=red guifg=red
+
+   if &filetype == 'mail'
+      highlight Statement cterm=none ctermfg=white gui=none guifg=white
+      highlight Type cterm=bold gui=bold
+      highlight mailEmail cterm=bold ctermfg=magenta guifg=magenta gui=bold
+      highlight mailQuoted2 cterm=none ctermfg=magenta gui=none guifg=magenta
+      highlight mailSmile cterm=bold ctermfg=magenta gui=bold guifg=magenta
+      highlight mailSubject cterm=bold ctermfg=yellow gui=bold
+   endif
+
+   if &filetype == 'html'
+      highlight htmlBold cterm=bold ctermfg=white
+      highlight htmlBoldItalic cterm=bold,reverse ctermfg=white
+      highlight htmlBoldUnderline cterm=bold,underline ctermfg=white
+      highlight htmlBoldUnderlineItalic cterm=bold,reverse,underline ctermfg=white
+      highlight htmlUnderline cterm=underline ctermfg=white
+      highlight htmlUnderlineItalic cterm=reverse,underline ctermfg=white
+   endif
 endif
 
 highlight SpellBad term=underline ctermfg=white ctermbg=red guifg=white guibg=red " gui=undercurl guisp=red

diff --git a/.vim/syntax/html.vim b/.vim/syntax/html.vim
deleted file mode 100644 (file)
index 80df508..0000000
--- a/.vim/syntax/html.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-if &background == 'light'
-   highlight link javaScript Identifier
-   highlight Title cterm=NONE ctermfg=black gui=NONE guifg=black
-endif

diff --git a/.vim/syntax/mail.vim b/.vim/syntax/mail.vim
index b70a53661bed29abc65d185c9544a7cfa7c8f95d..97b18e0b00e4c98ed63c9b254234a1a829fe0c08 100644 (file)
--- a/.vim/syntax/mail.vim
+++ b/.vim/syntax/mail.vim
@@ -2,28 +2,3 @@ syntax case ignore
 syntax match mailHeaderKey contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|to|cc|delivered-to|reply-to|mail-followup-to|x-attribution):.*$"
 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 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 mailQuoted2 cterm=NONE ctermfg=darkmagenta gui=NONE guifg=darkmagenta
-
-else
-   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

diff --git a/.vim/syntax/xml.vim b/.vim/syntax/xml.vim
deleted file mode 100644 (file)
index 9083ff3..0000000
--- a/.vim/syntax/xml.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-if &background == 'light'
-   highlight Identifier cterm=bold ctermfg=darkgrey gui=bold guifg=black
-endif