Mercurial Repositories > eric / file diff

--- a/eric6/QScintilla/Editor.py	Sat Sep 05 11:26:33 2020 +0200
+++ b/eric6/QScintilla/Editor.py	Sat Oct 03 11:13:46 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
@@ -1833,14 +1836,19 @@
             lang = self.lexer_.name()
             if normalized:
                 # adjust some Pygments lexer names
-                if lang == "Python 3":
+                if lang in ("Python 2.x", "Python"):
                     lang = "Python3"
+                elif lang == "Protocol Buffer":
+                    lang = "Protocol"
+                    
         else:
             lang = self.apiLanguage
             if forPygments:
                 # adjust some names to Pygments lexer names
                 if lang == "Python3":
-                    lang = "Python 3"
+                    lang = "Python"
+                elif lang == "Protocol":
+                    lang = "Protocol Buffer"
         return lang
     
     def getApiLanguage(self):