src/eric7/QScintilla/Editor.py

branch
eric7-maintenance
changeset 11125
a12ce139743a
parent 11118
967a88a16a21
parent 11123
2d31015ae44b
child 11155
e1843b6efa73
--- a/src/eric7/QScintilla/Editor.py	Tue Jan 14 17:30:54 2025 +0100
+++ b/src/eric7/QScintilla/Editor.py	Sun Feb 09 15:47:27 2025 +0100
@@ -5631,12 +5631,13 @@
         ):
             eolMode = self.__getEditorConfig("EOLMode", nodefault=True)
             if eolMode is None:
-                eolStr = self.project.getEolString()
-                self.setEolModeByEolString(eolStr)
-            else:
-                self.setEolMode(eolMode)
+                eolMode = self.project.getEolString()
         else:
             eolMode = self.__getEditorConfig("EOLMode")
+
+        if isinstance(eolMode, str):
+            self.setEolModeByEolString(eolMode)
+        else:
             self.setEolMode(eolMode)
         self.__eolChanged()
 

eric ide

mercurial