aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-05-17 08:30:59 +1000
committerNeil <nyamatongwe@gmail.com>2019-05-17 08:30:59 +1000
commit61a2cc3fadea9f805f572ef2ce233c12b428b871 (patch)
tree740bf042388b2444b305f06aefaaa99ed394b837
parentd50a8576e70ab84af42fb0bbac56c2d74ddc1898 (diff)
downloadscintilla-mirror-61a2cc3fadea9f805f572ef2ce233c12b428b871.tar.gz
Backport: Fixed performance bug where line end positions were reset withot need when
switching from or to Unicode. Only noticeable on huge files. Backport of changeset 7499:d800ba9f7006.
-rw-r--r--doc/ScintillaHistory.html5
-rw-r--r--src/CellBuffer.cxx1
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 6eff6c941..c1e9f5fc9 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -556,6 +556,11 @@
<li>
Fix bug where changing identifier sets in lexers preserved previous identifiers.
</li>
+ <li>
+ Fixed bug where changing to Unicode would rediscover line end positions even if still
+ sticking to ASCII (not Unicode NEL, LS, PS) line ends.
+ Only noticeable on huge files with over 100,000 lines.
+ </li>
<li>
Changed behaviour of SCI_STYLESETCASE(*,SC_CASE_CAMEL) so that it only treats 'a-zA-Z'
as word characters because this covers the feature's intended use (viewing case-insensitive ASCII-only
diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index 37094e708..4b4a427d9 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -677,7 +677,6 @@ void CellBuffer::Allocate(Sci::Position newSize) {
void CellBuffer::SetUTF8Substance(bool utf8Substance_) {
if (utf8Substance != utf8Substance_) {
utf8Substance = utf8Substance_;
- ResetLineEnds();
}
}