Applied st no_bold_colors patch cleanly

diff --git a/patches/st-no_bold_colors-20160727-308bfbf.diff b/patches/st-no_bold_colors-20160727-308bfbf.diff
new file mode 100644 (file)
index 0000000..c381703
--- /dev/null
+++ b/patches/st-no_bold_colors-20160727-308bfbf.diff
@@ -0,0 +1,13 @@
+diff --git a/st.c b/st.c
+index 2594c65..f6fe717 100644
+--- a/st.c
++++ b/st.c
+@@ -3719,7 +3719,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/st.c b/st/st.c
index b51adecdf4868f1d20c95389bef5ec364ee186f5..58d25d2bba9cc25d77f9c75e19f239438e557618 100644 (file)
--- a/st/st.c
+++ b/st/st.c
@@ -3789,7 +3789,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]) {