Merge commit '1ebc43af72ecf8499d4057b5ace63c37f84ca7d9'

This commit is contained in:
Ethan Schoonover 2011-05-04 23:52:11 -07:00
commit a4be301d06

View file

@ -4,7 +4,7 @@
" (see this url for latest release & screenshots)
" License: OSI approved MIT license (see end of this file)
" Created: In the middle of the night
" Modified: 2011 May 03
" Modified: 2011 May 04
"
" Usage "{{{
"
@ -217,7 +217,7 @@ call s:SetOption("underline",1)
call s:SetOption("italic",1) " note that we need to override this later if the terminal doesn't support
call s:SetOption("termcolors",16)
call s:SetOption("contrast","normal")
call s:SetOption("visibility","low")
call s:SetOption("visibility","normal")
call s:SetOption("diffmode","normal")
call s:SetOption("menu",1)
@ -599,13 +599,13 @@ exe "hi! Todo" .s:fmt_bold .s:fg_magenta.s:bg_none
" ---------------------------------------------------------------------
if (g:solarized_visibility=="high")
exe "hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none
exe "hi! NonText" .s:fmt_bold .s:fg_base1 .s:bg_none
exe "hi! NonText" .s:fmt_bold .s:fg_red .s:bg_none
elseif (g:solarized_visibility=="low")
exe "hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none
exe "hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none
else
exe "hi! SpecialKey" .s:fmt_bold .s:fg_red .s:bg_none
exe "hi! NonText" .s:fmt_bold .s:fg_base01 .s:bg_none
exe "hi! SpecialKey" .s:fmt_bold .s:fg_base00 .s:bg_base02
exe "hi! NonText" .s:fmt_bold .s:fg_base00 .s:bg_none
endif
exe "hi! StatusLine" .s:fmt_none .s:fg_base1 .s:bg_base02 .s:fmt_revbb
exe "hi! StatusLineNC" .s:fmt_none .s:fg_base00 .s:bg_base02 .s:fmt_revbb