aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html6
-rw-r--r--src/Document.cxx4
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 1ac7da9b0..81f76dc48 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -570,6 +570,7 @@
<td>Arkadiusz Michalski</td>
<td>Christian Schmitz</td>
<td>Michael Berlenz</td>
+ <td>Jacky Yang</td>
</tr>
</table>
<h2>Releases</h2>
@@ -586,6 +587,11 @@
where line state was never set for any lines.
<a href="https://sourceforge.net/p/scintilla/feature-requests/1441/">Feature #1441</a>.
</li>
+ <li>
+ Enable multiline regex for gcc and clang when REGEX_MULTILINE defined.
+ This requires gcc 11.3 or clang 14.
+ <a href="https://sourceforge.net/p/scintilla/bugs/2338/">Bug #2338</a>.
+ </li>
</ul>
<h3>
<a href="https://www.scintilla.org/scintilla524.zip">Release 5.2.4</a>
diff --git a/src/Document.cxx b/src/Document.cxx
index 5fd2f79e5..2312e3f5a 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -3162,6 +3162,10 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci:
if (!caseSensitive)
flagsRe = flagsRe | std::regex::icase;
+#if defined(REGEX_MULTILINE) && !defined(_MSC_VER)
+ flagsRe = flagsRe | std::regex::multiline;
+#endif
+
// Clear the RESearch so can fill in matches
search.Clear();