diff options
| author | Jacky Yang <unknown> | 2022-07-18 08:28:44 +1000 |
|---|---|---|
| committer | Jacky Yang <unknown> | 2022-07-18 08:28:44 +1000 |
| commit | cd203ffde6b18ecabd7371ca839afc6c779913b4 (patch) | |
| tree | cc7db8720a9d29961112cbedac5677e273030760 | |
| parent | f6a9859562ddeb04e882e4a3d15adbf64345452a (diff) | |
| download | scintilla-mirror-cd203ffde6b18ecabd7371ca839afc6c779913b4.tar.gz | |
Bug [#2338] Enable multiline regex for gcc and clang when REGEX_MULTILINE defined.
This requires gcc 11.3 or clang 14.
| -rw-r--r-- | doc/ScintillaHistory.html | 6 | ||||
| -rw-r--r-- | src/Document.cxx | 4 |
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(); |