Mercurial Repositories > eric / changeset

--- a/Preferences/PreferencesLexer.py	Thu Mar 14 19:39:51 2019 +0100
+++ b/Preferences/PreferencesLexer.py	Thu Mar 14 19:41:53 2019 +0100
@@ -97,7 +97,7 @@
         
         # read the last stored values from preferences file
         self.__lex.readSettings(Preferences.Prefs.settings, "Scintilla")
-        if self.__lex.hasSubStyles():
+        if self.__lex.hasSubstyles():
             self.__lex.loadSubstyles()
     
     def writeSettings(self):
@@ -105,8 +105,8 @@
         Public method to write the lexer settings.
         """
         self.__lex.writeSettings(Preferences.Prefs.settings, "Scintilla")
-        if self.__lex.hasSubStyles():
-            self.__lex.writeSubStyles()
+        if self.__lex.hasSubstyles():
+            self.__lex.writeSubstyles()
     
     def getStyles(self):
         """
@@ -121,7 +121,7 @@
             desc = self.__lex.description(i)
             if desc:
                 styles.append((desc, i, -1))
-        if self.__lex.hasSubStyles():
+        if self.__lex.hasSubstyles():
             for baseStyle in self.__lex.getBaseStyles():
                 for subStyle in range(self.__lex.substylesCount(baseStyle)):
                     desc = self.__lex.substyleDescription(baseStyle, subStyle)
@@ -233,7 +233,7 @@
         else:
             self.__lex.setPaper(c, style)
     
-    def defaulEolFill(self, style, substyle=-1):
+    def defaultEolFill(self, style, substyle=-1):
         """
         Public method to get the default eolFill flag for a style.
         

--- a/QScintilla/Editor.py	Thu Mar 14 19:39:51 2019 +0100
+++ b/QScintilla/Editor.py	Thu Mar 14 19:41:53 2019 +0100
@@ -1632,7 +1632,7 @@
             font = QFont(fdesc[0], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
-        if self.lexer_.hasSubStyles():
+        if self.lexer_.hasSubstyles():
             self.lexer_.readSubstyles(self)
         
         # now set the lexer properties
@@ -3313,7 +3313,7 @@
             if self.lexer_:
                 self.lexer_.readSettings(
                     Preferences.Prefs.settings, "Scintilla")
-                if self.lexer_.hasSubStyles():
+                if self.lexer_.hasSubstyles():
                     self.lexer_.readSubstyles(self)
                 self.lexer_.initProperties()
             self.setMonospaced(False)
@@ -4073,7 +4073,7 @@
         # read the lexer settings and reinit the properties
         if self.lexer_ is not None:
             self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
-            if self.lexer_.hasSubStyles():
+            if self.lexer_.hasSubstyles():
                 self.lexer_.readSubstyles(self)
             self.lexer_.initProperties()
             

--- a/QScintilla/Lexers/Lexer.py	Thu Mar 14 19:39:51 2019 +0100
+++ b/QScintilla/Lexers/Lexer.py	Thu Mar 14 19:41:53 2019 +0100
@@ -244,7 +244,7 @@
         """
         return self.lexer()
     
-    def hasSubStyles(self):
+    def hasSubstyles(self):
         """
         Public method to indicate the support of sub-styles.
         

--- a/QScintilla/MiniEditor.py	Thu Mar 14 19:39:51 2019 +0100
+++ b/QScintilla/MiniEditor.py	Thu Mar 14 19:41:53 2019 +0100
@@ -3044,7 +3044,7 @@
             font = QFont(fdesc[0], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
-        if self.lexer_.hasSubStyles():
+        if self.lexer_.hasSubstyles():
             self.lexer_.readSubstyles(self.__textEdit)
         
         # now set the lexer properties

--- a/QScintilla/Shell.py	Thu Mar 14 19:39:51 2019 +0100
+++ b/QScintilla/Shell.py	Thu Mar 14 19:41:53 2019 +0100
@@ -437,7 +437,7 @@
             self.lexer_.setDefaultFont(font)
         self.setLexer(self.lexer_)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
-        if self.lexer_.hasSubStyles():
+        if self.lexer_.hasSubstyles():
             self.lexer_.readSubstyles(self)
         
         # initialize the lexer APIs settings