commit b15e66c253264909196291906d55ffd686480aa4
parent 972bbf79fb0887477aaf74360a9c6c725a9ec176
Author: Nils Reuße <code@hxgn.net>
Date:   Wed, 15 Jul 2015 21:07:14 +0200
updated solarized patches for st 0.6 and latest git
Diffstat:
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/st.suckless.org/patches/solarized_color_scheme.md b/st.suckless.org/patches/solarized_color_scheme.md
@@ -4,7 +4,7 @@ Solarized color scheme
 Description
 -----------
 
-[Solarized][1] is a color scheme by Ethan Schoonover and exists in a
+[Solarized][1] is a color scheme by Ethan Schoonover which exists in a
 dark and a light variant.  These patches make the solarized colors
 available on st.
 
@@ -13,7 +13,7 @@ Notes
 -----
 
 No matter if you choose the light or dark theme, to get the correct
-colors, you *always* have to apply the [patch to st.c][7] (if you're
+colors, you *always* have to apply the [patch to st.c][8] (if you're
 using the latest git version of st, use [this patch to st.c][3]).  Then,
 apply one of the patches for either the [light][4] or the [dark][5]
 version of solarized.
@@ -38,6 +38,7 @@ Download
 --------
 
  * [st-0.5-no-bold-colors.diff][7]
+ * [st-0.6-no-bold-colors.diff][8]
  * [st-no-bold-colors.diff][3]
  * [st-solarized-light.diff][4]
  * [st-solarized-dark.diff][5]
@@ -49,6 +50,7 @@ Download
 [5]: st-solarized-dark.diff
 [6]: http://en.wikipedia.org/wiki/Source_Code_Pro
 [7]: st-0.5-no-bold-colors.diff
+[8]: st-0.6-no-bold-colors.diff
 
 Author
 ------
diff --git a/st.suckless.org/patches/st-0.6-no-bold-colors.diff b/st.suckless.org/patches/st-0.6-no-bold-colors.diff
@@ -0,0 +1,13 @@
+diff --git a/st.c b/st.c
+index b89d094..02bcf19 100644
+--- a/st.c
++++ b/st.c
+@@ -3454,7 +3454,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+ 
+ 	/* Change basic system colors [0-7] to bright system colors [8-15] */
+ 	if((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
+-		fg = &dc.col[base.fg + 8];
++		fg = &dc.col[base.fg];
+ 
+ 	if(IS_SET(MODE_REVERSE)) {
+ 		if(fg == &dc.col[defaultfg]) {
diff --git a/st.suckless.org/patches/st-no-bold-colors.diff b/st.suckless.org/patches/st-no-bold-colors.diff
@@ -1,13 +1,13 @@
 diff --git a/st.c b/st.c
-index c2da66b..2d4da96 100644
+index 64e2cec..13ceadc 100644
 --- a/st.c
 +++ b/st.c
-@@ -3438,7 +3438,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+@@ -3680,7 +3680,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
  
  	/* Change basic system colors [0-7] to bright system colors [8-15] */
- 	if((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
+ 	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
 -		fg = &dc.col[base.fg + 8];
 +		fg = &dc.col[base.fg];
  
- 	if(IS_SET(MODE_REVERSE)) {
- 		if(fg == &dc.col[defaultfg]) {
+ 	if (IS_SET(MODE_REVERSE)) {
+ 		if (fg == &dc.col[defaultfg]) {