PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 947a0ec..af0c80a 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -1,6 +1,8 @@
 2006-01-01 Kimmo
  PATCH: [ 1392347 ] Fix status after synching unique binary files
   Src: DirScan.cpp
+ PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
+  Src/editlib: ccrystaltextview.cpp
 
 2005-12-31 Perry
  PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages

diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp
index f465af3..be8477d 100644 (file)
--- a/Src/editlib/ccrystaltextview.cpp
+++ b/Src/editlib/ccrystaltextview.cpp
@@ -4742,10 +4742,11 @@ OnEditRepeat ()
     sText = m_pszLastFindWhat;
   else
     {
+      // If last find-text exists, cut it to first line
       bEnable = !sText.IsEmpty ();
       if (bEnable)
         {
-          int pos = sText.Find (_T('\n'));
+          int pos = sText.FindOneOf (_T("\r\n"));
           if (pos >= 0)
             sText = sText.Left (pos);
         }