Merge commit 'bc35c899ec8ef23d481a95028b93ec50b04bd16c'

This commit is contained in:
Ethan Schoonover 2011-04-08 00:35:19 -07:00
commit 86a875bb6e

View file

@ -624,17 +624,18 @@ exe "hi! Todo" .s:fmt_bold .s:fg_magenta.s:bg_none
" *Todo anything that needs extra attention; mostly the " *Todo anything that needs extra attention; mostly the
" keywords TODO FIXME and XXX " keywords TODO FIXME and XXX
" "
"Highlighting groups for various occasions "}}}
"----------------------------------------- " Extended highlighting "{{{
" ---------------------------------------------------------------------
if (g:solarized_visibility=="high") if (g:solarized_visibility=="high")
exe "hi! SpecialKey" .s:fmt_revr .s:fg_red .s:bg_none 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_base1 .s:bg_none
elseif (g:solarized_visibility=="low") elseif (g:solarized_visibility=="low")
exe "hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none exe "hi! SpecialKey" .s:fmt_bold .s:fg_base02 .s:bg_none
exe "hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none exe "hi! NonText" .s:fmt_bold .s:fg_base02 .s:bg_none
else else
exe "hi! SpecialKey" .s:fmt_bold .s:fg_red .s:bg_none 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! NonText" .s:fmt_bold .s:fg_base01 .s:bg_none
endif endif
exe "hi! Directory" .s:fmt_none .s:fg_blue .s:bg_none exe "hi! Directory" .s:fmt_none .s:fg_blue .s:bg_none
exe "hi! ErrorMsg" .s:fmt_revr .s:fg_red .s:bg_none exe "hi! ErrorMsg" .s:fmt_revr .s:fg_red .s:bg_none
@ -644,8 +645,13 @@ exe "hi! MoreMsg" .s:fmt_none .s:fg_blue .s:bg_none
exe "hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none exe "hi! ModeMsg" .s:fmt_none .s:fg_blue .s:bg_none
exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02 exe "hi! LineNr" .s:fmt_none .s:fg_base01 .s:bg_base02
exe "hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none exe "hi! Question" .s:fmt_bold .s:fg_cyan .s:bg_none
exe "hi! StatusLine" .s:fmt_none .s:fg_base02 .s:bg_base1 if (has("gui_running")) || &t_Co > 8
exe "hi! StatusLineNC" .s:fmt_none .s:fg_base02 .s:bg_base00 exe "hi! StatusLine" .s:fmt_none .s:fg_base02 .s:bg_base1
exe "hi! StatusLineNC" .s:fmt_none .s:fg_base02 .s:bg_base00
else
exe "hi! StatusLine" .s:fmt_none .s:fg_base02 .s:bg_base2
exe "hi! StatusLineNC" .s:fmt_none .s:fg_base02 .s:bg_base2
endif
exe "hi! VertSplit" .s:fmt_bold .s:fg_base00 .s:bg_base00 exe "hi! VertSplit" .s:fmt_bold .s:fg_base00 .s:bg_base00
exe "hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none exe "hi! Title" .s:fmt_bold .s:fg_orange .s:bg_none
exe "hi! Visual" .s:fmt_stnd .s:fg_none .s:bg_base02 exe "hi! Visual" .s:fmt_stnd .s:fg_none .s:bg_base02
@ -674,13 +680,10 @@ exe "hi! TabLineFill" .s:fmt_undr .s:fg_base0 .s:bg_base02 .s:sp_base0
exe "hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02 exe "hi! CursorColumn" .s:fmt_none .s:fg_none .s:bg_base02
exe "hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base02 .s:sp_base1 exe "hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base02 .s:sp_base1
exe "hi! ColorColumn" .s:fmt_none .s:fg_none .s:bg_base02 exe "hi! ColorColumn" .s:fmt_none .s:fg_none .s:bg_base02
exe "hi! Cursor" .s:fmt_revr .s:fg_none .s:bg_none exe "hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0
exe "hi! lCursor" .s:fmt_stnd .s:fg_none .s:bg_none hi! link lCursor Cursor
exe "hi! MatchParen" .s:fmt_bold .s:fg_red .s:bg_base01 exe "hi! MatchParen" .s:fmt_bold .s:fg_red .s:bg_base01
"}}}
" Extended highlighting "{{{
" ---------------------------------------------------------------------
"}}} "}}}
" vim syntax highlighting "{{{ " vim syntax highlighting "{{{
" --------------------------------------------------------------------- " ---------------------------------------------------------------------