From 1172094322af0d3dfc03ff813b15ade18633c421 Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Wed, 16 May 2018 11:43:01 +1000
Subject: Backport: Fix regex crash reported with libstdc++ on macOS that
 occurs when the regex has a locale imbued.

Backport of changeset 6953:85ff33e92309.
---
 src/Document.cxx | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src')

diff --git a/src/Document.cxx b/src/Document.cxx
index 65ddba8e0..54656ab03 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -2951,13 +2951,6 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci:
 #endif
 			ws[outLen] = 0;
 			std::wregex regexp;
-#if defined(__APPLE__)
-			// Using a UTF-8 locale doesn't change to Unicode over a byte buffer so '.'
-			// is one byte not one character.
-			// However, on OS X this makes wregex act as Unicode
-			std::locale localeU("en_US.UTF-8");
-			regexp.imbue(localeU);
-#endif
 			regexp.assign(&ws[0], flagsRe);
 			matched = MatchOnLines<UTF8Iterator>(doc, regexp, resr, search);
 
-- 
cgit v1.2.3