Mercurial Repositories > eric / file diff

--- a/src/eric7/QScintilla/Editor.py	Tue Sep 03 17:28:40 2024 +0200
+++ b/src/eric7/QScintilla/Editor.py	Tue Sep 03 17:42:44 2024 +0200
@@ -7399,7 +7399,7 @@
         regExp = re.compile(
             "|".join(Editor.VcsConflictMarkerLineRegExpList), re.MULTILINE
         )
-        matches = [m for m in regExp.finditer(self.text())]
+        matches = list(regExp.finditer(self.text()))
         for match in matches:
             line, _ = self.lineIndexFromPosition(match.start())
             conflictMarkerLines.append(line)
@@ -9635,7 +9635,7 @@
         regExp = re.compile(r"\b{0}\b".format(word))
         startPos = wordEndPos if forward else wordStartPos
 
-        matches = [m for m in regExp.finditer(self.text())]
+        matches = list(regExp.finditer(self.text()))
         if matches:
             if forward:
                 matchesAfter = [m for m in matches if m.start() >= startPos]