Merge commit '15059af5216fa67b92f3fdd5a4e2dadd996a211e'

This commit is contained in:
Ethan Schoonover 2011-05-03 00:13:06 -07:00
commit 001565e72c

View file

@ -4,7 +4,7 @@
" (see this url for latest release & screenshots) " (see this url for latest release & screenshots)
" License: OSI approved MIT license (see end of this file) " License: OSI approved MIT license (see end of this file)
" Created: In the middle of the night " Created: In the middle of the night
" Modified: 2011 May 02 " Modified: 2011 May 03
" "
" Usage "{{{ " Usage "{{{
" "
@ -409,7 +409,7 @@ endif
"}}} "}}}
" Overrides dependent on user specified values and environment "{{{ " Overrides dependent on user specified values and environment "{{{
" --------------------------------------------------------------------- " ---------------------------------------------------------------------
if g:solarized_bold == 0 if (g:solarized_bold == 0 || &t_Co < 16)
let s:b = "" let s:b = ""
else else
let s:b = ",bold" let s:b = ",bold"