Mercurial Repositories > eric / file diff

--- a/QScintilla/Shell.py	Sat Mar 02 11:17:15 2019 +0100
+++ b/QScintilla/Shell.py	Fri Apr 05 19:06:39 2019 +0200
@@ -437,6 +437,8 @@
             self.lexer_.setDefaultFont(font)
         self.setLexer(self.lexer_)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
+        if self.lexer_.hasSubstyles():
+            self.lexer_.readSubstyles(self)
         
         # initialize the lexer APIs settings
         api = self.vm.getAPIsManager().getAPIs(self.language)
@@ -2239,9 +2241,11 @@
         @type bool
         """
         self.__lastSearch = (txt, caseSensitive, wholeWord, regexp)
+        posixMode = Preferences.getEditor("SearchRegexpMode") == 0 and regexp
+        cxx11Mode = Preferences.getEditor("SearchRegexpMode") == 1 and regexp
         ok = self.findFirst(
             txt, regexp, caseSensitive, wholeWord, True, forward=True,
-            posix=regexp)
+            posix=posixMode, cxx11=cxx11Mode)
         self.searchStringFound.emit(ok)
     
     def __searchPrev(self):
@@ -2271,9 +2275,12 @@
             line, index = self.getSelection()[:2]
         else:
             line, index = -1, -1
+        posixMode = Preferences.getEditor("SearchRegexpMode") == 0 and regexp
+        cxx11Mode = Preferences.getEditor("SearchRegexpMode") == 1 and regexp
         ok = self.findFirst(
             txt, regexp, caseSensitive, wholeWord, True,
-            forward=False, line=line, index=index, posix=regexp)
+            forward=False, line=line, index=index, posix=posixMode,
+            cxx11=cxx11Mode)
         self.searchStringFound.emit(ok)
     
     def historyStyle(self):