Mercurial Repositories > eric / changeset

--- a/eric6/QScintilla/Editor.py	Wed Sep 30 19:50:33 2020 +0200
+++ b/eric6/QScintilla/Editor.py	Thu Oct 01 17:34:48 2020 +0200
@@ -1751,7 +1751,10 @@
             return
         
         if pyname:
-            self.apiLanguage = "Pygments|{0}".format(pyname)
+            if pyname.startswith("Pygments|"):
+                self.apiLanguage = pyname
+            else:
+                self.apiLanguage = "Pygments|{0}".format(pyname)
         else:
             if language == "Protocol":
                 self.apiLanguage = language

--- a/eric6/QScintilla/MiniEditor.py	Wed Sep 30 19:50:33 2020 +0200
+++ b/eric6/QScintilla/MiniEditor.py	Thu Oct 01 17:34:48 2020 +0200
@@ -3132,7 +3132,10 @@
             return
         
         if pyname:
-            self.apiLanguage = "Pygments|{0}".format(pyname)
+            if pyname.startswith("Pygments|"):
+                self.apiLanguage = pyname
+            else:
+                self.apiLanguage = "Pygments|{0}".format(pyname)
         else:
             if language == "Protocol":
                 self.apiLanguage = language
@@ -3576,7 +3579,8 @@
         """
         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]
                 elif option == "IndentWidth":