diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 368d4cd79..cbd129a87 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -235,6 +235,7 @@ <li>Istvan Szollosi</li> <li>Xie Renhui</li> <li>Enrico Tröger</li> + <li>Todd Whiteman</li> </ul> <p> Images used in GTK+ version diff --git a/src/Editor.cxx b/src/Editor.cxx index 8a2000090..acea1f463 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -2176,7 +2176,7 @@ ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackgroun return vsDraw.edgecolour.allocated; if (inHotspot && vsDraw.hotspotBackgroundSet) return vsDraw.hotspotBackground.allocated; - if (overrideBackground) + if (overrideBackground && (styleMain != STYLE_BRACELIGHT) && (styleMain != STYLE_BRACEBAD)) return background; } return vsDraw.styles[styleMain].back.allocated; |