.vim: change colors

diff --git a/.vim/syntax/mail.vim b/.vim/syntax/mail.vim
index 024fad952598e8fce791b8759f27ec980eb6a6f2..316bd88cf71ef5f156c6f4fe89b3065b79377b33 100644 (file)
--- a/.vim/syntax/mail.vim
+++ b/.vim/syntax/mail.vim
@@ -4,10 +4,10 @@ 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/]`
 
 if &background == 'light'
-   highlight Constant cterm=bold ctermfg=blue gui=bold guifg=blue
    highlight Statement cterm=NONE ctermfg=black gui=NONE guifg=darkgrey
    highlight link mailHeaderEmail Normal
-   highlight link mailHeaderKey SpecialKey
+   highlight mailHeaderKey cterm=bold ctermfg=black
+   highlight link mailEmail Comment
    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

diff --git a/.vim/syntax/synload.vim b/.vim/syntax/synload.vim
index fc3978569264f2ed5a564b4e8cf773fde266f162..ef24df17a7db2297d357fef5c7dab7ae5fe4ce43 100644 (file)
--- a/.vim/syntax/synload.vim
+++ b/.vim/syntax/synload.vim
@@ -2,18 +2,39 @@
 source $VIMRUNTIME/syntax/synload.vim
 
 " Override for all syntax files
+
+if !has("gui_running")
+   if &background == 'light'
+      highlight MoreMsg cterm=bold ctermfg=NONE
+      highlight Question cterm=bold ctermfg=NONE
+   else
+      highlight MoreMsg ctermfg=white
+      highlight ModeMsg ctermfg=white
+      highlight Question ctermfg=white
+   endif
+endif
+
+highlight SpellBad term=underline ctermfg=white ctermbg=red guifg=white guibg=red " gui=undercurl guisp=red
+highlight StatusLine cterm=bold,reverse ctermfg=blue ctermbg=white guifg=blue guibg=white
+highlight Visual ctermfg=white ctermbg=blue guifg=white guibg=blue " Selection highlighting
+
 if &background == 'light'
-   highlight Comment cterm=NONE ctermfg=darkgrey gui=NONE guifg=SlateGray
-   highlight Constant cterm=NONE ctermfg=brown gui=NONE guifg=brown
-   highlight Identifier cterm=NONE ctermfg=black gui=NONE guifg=black
+   highlight Comment ctermfg=darkmagenta guifg=darkmagenta
+   highlight Constant ctermfg=brown guifg=brown
+   highlight Cursor guifg=white guibg=green
+   highlight Identifier ctermfg=black guifg=black
+   highlight NonText ctermfg=darkgrey guifg=grey
+   highlight Normal guibg=grey90
    highlight PreProc ctermfg=darkgreen guifg=darkgreen
-   highlight Statement cterm=bold ctermfg=black gui=bold guifg=black
-   highlight Type cterm=NONE ctermfg=black gui=NONE guifg=black
+   highlight Special ctermfg=darkgrey
+   highlight SpecialKey ctermfg=darkgrey
+   highlight Statement cterm=bold ctermfg=black guifg=black
+   highlight Type ctermfg=black guifg=black
 
    if &diff
-      highlight DiffAdd ctermbg=green ctermfg=white
-      highlight DiffChange ctermbg=cyan ctermfg=black
-      highlight DiffText ctermbg=magenta ctermfg=white
-      highlight DiffDelete ctermbg=red ctermfg=black
+      highlight DiffAdd ctermfg=white ctermbg=green
+      highlight DiffChange ctermfg=black ctermbg=cyan
+      highlight DiffText ctermfg=white ctermbg=magenta
+      highlight DiffDelete ctermfg=black ctermbg=red
    endif
 endif

diff --git a/.vimrc b/.vimrc
index e45f9033c218260fd004e1a214a7e9eeec4f2482..02e779069d1f1ae8afc37c626f35fa2953261da1 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -197,19 +197,6 @@ if has("gui_running")
    " map <S-Insert> <MiddleMouse>
    " map! <S-Insert> <MiddleMouse>
 
-
-   " Set nice colors
-   " Background for normal text is light grey
-   " Cursor is green
-   " Text below the last line is darker grey
-   " Status line is bright white on blue
-   highlight Normal guibg=grey90
-   highlight Cursor guibg=green guifg=white
-   highlight NonText guibg=grey80
-   highlight Constant guibg=grey90
-   highlight Special gui=NONE guibg=grey90
-   highlight StatusLine gui=bold guifg=white guibg=blue
-
    " ----------
    " From http://slobin.pp.ru/vim/_vimrc.html
 
@@ -220,19 +207,14 @@ if has("gui_running")
    " The <CR> key should select from completion menu without adding a newline
    imap <expr> <CR> pumvisible() ? "<C-Y>" : "<CR>"
    " ----------
-else
 
+else
    if (&term =~ "linux") || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark')
          \ || has("win32")
       " Background of the terminal is black or dark grey
       set background=dark
-      highlight MoreMsg ctermfg=white
-      highlight ModeMsg ctermfg=white
-      highlight Question ctermfg=white
    else
       set background=light
-      highlight MoreMsg cterm=bold ctermfg=NONE
-      highlight Question cterm=bold ctermfg=NONE
    endif
 
    if (&term =~ "linux")
@@ -269,10 +251,6 @@ else
    endif
 endif
 
-highlight SpellBad term=underline cterm=NONE ctermfg=white ctermbg=red guifg=white guibg=red " gui=undercurl guisp=red
-highlight StatusLine cterm=bold ctermfg=white ctermbg=blue gui=NONE guifg=white guibg=blue
-highlight Visual cterm=NONE ctermfg=white ctermbg=blue gui=NONE guifg=white guibg=blue " Selection highlighting
-
 " Multiline comments often confuse vim syntax highlighting - these maps
 " allow to resynchronize; the first is faster, the second is more thorough
 nmap \sc :syntax sync clear<Enter>