Mercurial Repositories > eric / changeset

--- a/eric6/QScintilla/Editor.py	Wed Oct 09 19:24:09 2019 +0200
+++ b/eric6/QScintilla/Editor.py	Wed Oct 09 19:24:53 2019 +0200
@@ -202,6 +202,7 @@
         self.showingNotcoveredMarkers = False
         
         self.lexer_ = None
+        self.apiLanguage = ''
         
         self.__loadEditorConfig()
         
@@ -209,7 +210,6 @@
         self.__lexerReset = False
         self.completer = None
         self.encoding = self.__getEditorConfig("DefaultEncoding")
-        self.apiLanguage = ''
         self.lastModified = 0
         self.line = -1
         self.inReopenPrompt = False
@@ -8428,11 +8428,12 @@
         """
         if option in ("TabWidth", "IndentWidth"):
             overrides = Preferences.getEditor("TabIndentOverride")
-            if self.filetype in overrides:
+            language = self.filetype or self.apiLanguage
+            if language in overrides:
                 if option == "TabWidth":
-                    return overrides[self.filetype][0]
+                    return overrides[language][0]
                 elif option == "IndentWidth":
-                    return overrides[self.filetype][1]
+                    return overrides[language][1]
         
         return None