From d50a8576e70ab84af42fb0bbac56c2d74ddc1898 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 11 May 2019 07:25:22 +1000 Subject: Backport: Feature [feature-requests:#1283]. Standardise spelling - "color" -> "colour". Backport of changeset 7498:7dd63f4402ae. --- src/ViewStyle.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ViewStyle.cxx') diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index a4535abca..d6fd42a6d 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -440,12 +440,12 @@ bool ViewStyle::IsLineFrameOpaque(bool caretActive, bool lineContainsCaret) cons (caretLineAlpha == SC_ALPHA_NOALPHA) && lineContainsCaret; } -// See if something overrides the line background color: Either if caret is on the line -// and background color is set for that, or if a marker is defined that forces its background -// color onto the line, or if a marker is defined but has no selection margin in which to +// See if something overrides the line background colour: Either if caret is on the line +// and background colour is set for that, or if a marker is defined that forces its background +// colour onto the line, or if a marker is defined but has no selection margin in which to // display itself (as long as it's not an SC_MARK_EMPTY marker). These are checked in order // with the earlier taking precedence. When multiple markers cause background override, -// the color for the highest numbered one is used. +// the colour for the highest numbered one is used. ColourOptional ViewStyle::Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const { ColourOptional background; if (!caretLineFrame && (caretActive || alwaysShowCaretLineBackground) && showCaretLineBackground && -- cgit v1.2.3