diff -r c64ee71cf27b -r 2a22d0880d21 eric7/QScintilla/Editor.py
--- a/eric7/QScintilla/Editor.py Wed Aug 04 15:35:49 2021 +0200
+++ b/eric7/QScintilla/Editor.py Tue Aug 10 21:07:19 2021 +0200
@@ -1088,7 +1088,7 @@
self.languagesActGrp = QActionGroup(self)
self.noLanguageAct = menu.addAction(
UI.PixmapCache.getIcon("fileText"),
- self.tr("No Language"))
+ self.tr("Text"))
self.noLanguageAct.setCheckable(True)
self.noLanguageAct.setData("None")
self.languagesActGrp.addAction(self.noLanguageAct)
@@ -1538,7 +1538,8 @@
(self.lexer_.lexer() == "container" or
self.lexer_.lexer() is None)
):
- self.SCN_STYLENEEDED.disconnect(self.__styleNeeded)
+ with contextlib.suppress(TypeError):
+ self.SCN_STYLENEEDED.disconnect(self.__styleNeeded)
self.apiLanguage = ""
self.lexer_ = None
@@ -1551,7 +1552,8 @@
self.__setTextDisplay()
self.__setMarginsDisplay()
self.setMonospaced(useMonospaced)
- self.menuActs["MonospacedFont"].setChecked(self.useMonospaced)
+ with contextlib.suppress(AttributeError):
+ self.menuActs["MonospacedFont"].setChecked(self.useMonospaced)
self.__docstringGenerator = None
@@ -1780,6 +1782,11 @@
language = self.project.getEditorLexerAssoc(basename)
if not language:
language = Preferences.getEditorLexerAssoc(basename)
+ if language == "Text":
+ # no highlighting for plain text files
+ self.__resetLanguage()
+ return
+
if not language:
bindName = self.__bindName(self.text(0))
if bindName:
