Fix mixed eol-style

diff --git a/Externals/crystaledit/editlib/ccrystaltextbuffer.cpp b/Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
index 856eb90..b0bd316 100644 (file)
--- a/Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
+++ b/Externals/crystaledit/editlib/ccrystaltextbuffer.cpp
@@ -1034,7 +1034,7 @@ InternalDeleteText (CCrystalTextView * pSource, int nStartLine, int nStartChar,
       const int nDelCount = nEndLine - nStartLine;
       for (int L = nStartLine + 1; L <= nEndLine; L++)
         m_aLines[L].Clear();
-      std::vector<LineInfo>::iterator iterBegin = m_aLines.begin() + nStartLine + 1;\r
+      std::vector<LineInfo>::iterator iterBegin = m_aLines.begin() + nStartLine + 1;
       std::vector<LineInfo>::iterator iterEnd = iterBegin + nDelCount;
       m_aLines.erase(iterBegin, iterEnd);
 

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index ef4fc56..39582e2 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -30,7 +30,7 @@
 
 #include "StdAfx.h"
 #include <shlwapi.h>           // PathFindFileName()
-#include <Poco/StringTokenizer.h>\r
+#include <Poco/StringTokenizer.h>
 #include "Merge.h"
 #include "HexMergeDoc.h"
 #include "UnicodeString.h"
@@ -308,9 +308,9 @@ void CDirDoc::LoadLineFilterList()
        std::string regexp_str = ucr::toUTF8(filters);
 
        // Add every "line" of regexps to regexp list
-       StringTokenizer tokens(regexp_str, "\r\n");\r
-       for (StringTokenizer::Iterator it = tokens.begin(); it != tokens.end(); it++)\r
-               m_pCtxt->m_pFilterList->AddRegExp(*it);\r
+       StringTokenizer tokens(regexp_str, "\r\n");
+       for (StringTokenizer::Iterator it = tokens.begin(); it != tokens.end(); it++)
+               m_pCtxt->m_pFilterList->AddRegExp(*it);
 }
 
 void CDirDoc::DiffThreadCallback(int& state)