From 89e74637ef701d63828ef39bc16fb85323f0413c Mon Sep 17 00:00:00 2001 From: Zufu Liu Date: Sun, 18 May 2025 09:24:34 +1000 Subject: Modify wrapping fix to be more efficient. https://github.com/notepad-plus-plus/notepad-plus-plus/pull/16373 --- src/Document.cxx | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/Document.cxx') diff --git a/src/Document.cxx b/src/Document.cxx index 7dbe499a2..e6f8f3543 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -1314,16 +1314,10 @@ bool Scintilla::Internal::DiscardLastCombinedCharacter(std::string_view &text) n // Modified to move Sk (Symbol Modifier) from ccs-base to ccs-extend to preserve modified emoji // May break before and after Control which is defined as most of ccC? but not some of ccCf and ccCn // so treat ccCc, ccCs, ccCo as base for now. - // Treat \r\n as a single item to avoid separating the characters. std::string_view truncated = text; while (truncated.length() > UTF8MaxBytes) { // Give up when short - if (truncated.substr(truncated.length()-2) == "\r\n") { - truncated.remove_suffix(2); - text = truncated; - return true; - } const CharacterExtracted ce = LastCharacter(truncated); const CharacterCategory cc = CategoriseCharacter(static_cast(ce.character)); truncated.remove_suffix(ce.widthBytes); -- cgit v1.2.3