Mercurial Repositories > eric / file diff

--- a/QScintilla/Editor.py	Tue Mar 05 19:50:32 2019 +0100
+++ b/QScintilla/Editor.py	Wed Mar 06 18:44:29 2019 +0100
@@ -29,7 +29,7 @@
 from E5Gui import E5FileDialog, E5MessageBox
 from E5Utilities.E5Cache import E5Cache
 
-from .QsciScintillaCompat import QsciScintillaCompat
+from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
 from .EditorMarkerMap import EditorMarkerMap
 
 import Preferences
@@ -4343,6 +4343,9 @@
             Preferences.getEditor("CaretLineAlwaysVisible"))
         self.caretWidth = Preferences.getEditor("CaretWidth")
         self.setCaretWidth(self.caretWidth)
+        self.caretLineFrameWidth = Preferences.getEditor("CaretLineFrameWidth")
+        if QSCINTILLA_VERSION() >= 0x020B00:
+            self.setCaretLineFrameWidth(self.caretLineFrameWidth)
         self.useMonospaced = Preferences.getEditor("UseMonospacedFont")
         self.setMonospaced(self.useMonospaced)
         edgeMode = Preferences.getEditor("EdgeMode")
@@ -4356,6 +4359,7 @@
         self.setWrapMode(Preferences.getEditor("WrapLongLinesMode"))
         self.setWrapVisualFlags(wrapVisualFlag, wrapVisualFlag)
         self.setWrapIndentMode(Preferences.getEditor("WrapIndentMode"))
+        self.setWrapStartIndent(Preferences.getEditor("WrapStartIndent"))
         
         self.zoomTo(Preferences.getEditor("ZoomFactor"))