Mercurial Repositories > eric / file comparison
comparison: eric6/QScintilla/MiniEditor.py
eric6/QScintilla/MiniEditor.py
- changeset 7730
- 20b05e846148
- parent 7690
- a59680062837
- child 7746
- 12d5e1e6abd1
equal
deleted
inserted
replaced
| 7729:f2f7b7b24879 | 7730:20b05e846148 |
|---|---|
| 3130 self.__textEdit.setLexer() | 3130 self.__textEdit.setLexer() |
| 3131 self.apiLanguage = "" | 3131 self.apiLanguage = "" |
| 3132 return | 3132 return |
| 3133 | 3133 |
| 3134 if pyname: | 3134 if pyname: |
| 3135 self.apiLanguage = "Pygments|{0}".format(pyname) | 3135 if pyname.startswith("Pygments|"): |
| 3136 self.apiLanguage = pyname | |
| 3137 else: | |
| 3138 self.apiLanguage = "Pygments|{0}".format(pyname) | |
| 3136 else: | 3139 else: |
| 3137 if language == "Protocol": | 3140 if language == "Protocol": |
| 3138 self.apiLanguage = language | 3141 self.apiLanguage = language |
| 3139 else: | 3142 else: |
| 3140 # Change API language for lexer where QScintilla reports | 3143 # Change API language for lexer where QScintilla reports |
| 3574 @return override value; None in case nothing is defined | 3577 @return override value; None in case nothing is defined |
| 3575 @rtype any | 3578 @rtype any |
| 3576 """ | 3579 """ |
| 3577 if option in ("TabWidth", "IndentWidth"): | 3580 if option in ("TabWidth", "IndentWidth"): |
| 3578 overrides = Preferences.getEditor("TabIndentOverride") | 3581 overrides = Preferences.getEditor("TabIndentOverride") |
| 3579 if self.filetype in overrides: | 3582 language = self.filetype or self.apiLanguage |
| 3583 if language in overrides: | |
| 3580 if option == "TabWidth": | 3584 if option == "TabWidth": |
| 3581 return overrides[self.filetype][0] | 3585 return overrides[self.filetype][0] |
| 3582 elif option == "IndentWidth": | 3586 elif option == "IndentWidth": |
| 3583 return overrides[self.filetype][1] | 3587 return overrides[self.filetype][1] |
| 3584 | 3588 |
