Mercurial Repositories > eric / file comparison
comparison: src/eric7/QScintilla/Editor.py
src/eric7/QScintilla/Editor.py
- branch
- eric7-maintenance
- changeset 11125
- a12ce139743a
- parent 11118
- 967a88a16a21
- parent 11123
- 2d31015ae44b
- child 11155
- e1843b6efa73
equal
deleted
inserted
replaced
| 11119:3902fb1f4129 | 11125:a12ce139743a |
|---|---|
| 5629 and self.project.isOpen() | 5629 and self.project.isOpen() |
| 5630 and self.project.isProjectFile(self.fileName) | 5630 and self.project.isProjectFile(self.fileName) |
| 5631 ): | 5631 ): |
| 5632 eolMode = self.__getEditorConfig("EOLMode", nodefault=True) | 5632 eolMode = self.__getEditorConfig("EOLMode", nodefault=True) |
| 5633 if eolMode is None: | 5633 if eolMode is None: |
| 5634 eolStr = self.project.getEolString() | 5634 eolMode = self.project.getEolString() |
| 5635 self.setEolModeByEolString(eolStr) | |
| 5636 else: | |
| 5637 self.setEolMode(eolMode) | |
| 5638 else: | 5635 else: |
| 5639 eolMode = self.__getEditorConfig("EOLMode") | 5636 eolMode = self.__getEditorConfig("EOLMode") |
| 5637 | |
| 5638 if isinstance(eolMode, str): | |
| 5639 self.setEolModeByEolString(eolMode) | |
| 5640 else: | |
| 5640 self.setEolMode(eolMode) | 5641 self.setEolMode(eolMode) |
| 5641 self.__eolChanged() | 5642 self.__eolChanged() |
| 5642 | 5643 |
| 5643 def __setAutoCompletion(self): | 5644 def __setAutoCompletion(self): |
| 5644 """ | 5645 """ |
