aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ViewStyle.cxx
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-05-11 07:25:22 +1000
committerNeil <nyamatongwe@gmail.com>2019-05-11 07:25:22 +1000
commitdbb3dbe28d22720639967832cef6f6e8163d472a (patch)
tree91edf03db5070f9429602e8c3ab0b94a1225f0ab /src/ViewStyle.cxx
parent796d60abaa071e4baa4f047249cb8955071478b0 (diff)
downloadscintilla-mirror-dbb3dbe28d22720639967832cef6f6e8163d472a.tar.gz
Feature [feature-requests:#1283]. Standardise spelling - "color" -> "colour".
Diffstat (limited to 'src/ViewStyle.cxx')
-rw-r--r--src/ViewStyle.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index aa3c4e477..cfd9701ae 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -441,12 +441,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 &&