From bcb502808ef2f673718e456fec62c0fcef8edf3b Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 2 Dec 2012 19:29:23 +0000 Subject: [PATCH] [BUG_FIXED] (Author: Dave Brotherstone) Fix find "\r\n" in RegExpr mode. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@990 f5eea248-9336-0410-98b8-ebc06183d4e3 --- scintilla/boostregex/BoostRegExSearch.cxx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scintilla/boostregex/BoostRegExSearch.cxx b/scintilla/boostregex/BoostRegExSearch.cxx index 2157bbc2..d37e7491 100644 --- a/scintilla/boostregex/BoostRegExSearch.cxx +++ b/scintilla/boostregex/BoostRegExSearch.cxx @@ -163,14 +163,6 @@ long BoostRegexSearch::FindText(Document* doc, int minPos, int maxPos, const cha // Work out the range of lines we're searching across, moving beyond an empty end-of-line int lineRangeStart = doc->LineFromPosition(startPos); int lineRangeEnd = doc->LineFromPosition(endPos); - if ((increment == 1) && - (startPos >= doc->LineEnd(lineRangeStart)) && - (lineRangeStart < lineRangeEnd)) - { - // the start position is at end of line or between line end characters. - lineRangeStart++; - startPos = doc->LineStart(lineRangeStart); - } regex_constants::match_flag_type flags(regex_constants::match_default);