aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlib/StyleContext.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-05-31 09:27:48 +1000
committerNeil <nyamatongwe@gmail.com>2014-05-31 09:27:48 +1000
commit9bc61b338dfe63d2e6fcc66bc0933a0de6bcd31b (patch)
tree64c541e9dcb42c9999759ab7dd40d67c72749b9a /lexlib/StyleContext.h
parent8326c658b392ba13e92918dd89deebd60bcd195f (diff)
parent8b447b76bbc110e055a0637657f5f00c65cc98dd (diff)
downloadscintilla-mirror-9bc61b338dfe63d2e6fcc66bc0933a0de6bcd31b.tar.gz
Merge 343-Win32-Fix which fixes hangs and crashes at shutdown on Windows.
Diffstat (limited to 'lexlib/StyleContext.h')
-rw-r--r--lexlib/StyleContext.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h
index 9b5ce5dff..837386cef 100644
--- a/lexlib/StyleContext.h
+++ b/lexlib/StyleContext.h
@@ -66,7 +66,7 @@ public:
int widthNext;
StyleContext(unsigned int startPos, unsigned int length,
- int initStyle, LexAccessor &styler_, char chMask=31) :
+ int initStyle, LexAccessor &styler_, char chMask='\377') :
styler(styler_),
multiByteAccess(0),
endPos(startPos + length),
@@ -86,7 +86,7 @@ public:
if (styler.Encoding() != enc8bit) {
multiByteAccess = styler.MultiByteAccess();
}
- styler.StartAt(startPos, chMask);
+ styler.StartAt(startPos /*, chMask*/);
styler.StartSegment(startPos);
currentLine = styler.GetLine(startPos);
lineStartNext = styler.LineStart(currentLine+1);