diff -r 14680839ad7a -r d062df8f1d9f Preferences/__init__.py
--- a/Preferences/__init__.py Sat Mar 02 11:17:15 2019 +0100
+++ b/Preferences/__init__.py Fri Apr 05 19:06:39 2019 +0200
@@ -401,6 +401,8 @@
"UseMonospacedFont": False,
"WrapLongLinesMode": QsciScintilla.WrapNone,
"WrapVisualFlag": QsciScintilla.WrapFlagNone,
+ "WrapIndentMode": QsciScintilla.WrapIndentFixed,
+ "WrapStartIndent": 0,
"WarnFilesize": 512,
"ClearBreaksOnClose": True,
"StripTrailingWhitespace": False,
@@ -417,6 +419,7 @@
"CaretLineVisible": False,
"CaretLineAlwaysVisible": False,
"CaretWidth": 1,
+ "CaretLineFrameWidth": 0,
"ColourizeSelText": False,
"CustomSelectionColours": False,
"ExtendSelectionToEol": False,
@@ -467,6 +470,7 @@
"QuickSearchMarkersEnabled": True,
"MarkOccurrencesEnabled": True,
"MarkOccurrencesTimeout": 500, # 500 milliseconds
+ "SearchRegexpMode": 0, # 0: POSIX mode, 1: CXX11 mode
"AdvancedEncodingDetection": True,
"SpellCheckingEnabled": True,
@@ -1911,6 +1915,8 @@
else:
exts.append(".{0}".format(ext))
return exts
+
+ return None
def setPython(key, value, prefClass=Prefs):
@@ -2165,17 +2171,17 @@
"Editor/" + key, prefClass.editorDefaults[key])
elif key in ["AutosaveInterval", "TabWidth", "IndentWidth",
"FoldingStyle", "WarnFilesize", "EdgeMode", "EdgeColumn",
- "CaretWidth", "AutoCompletionSource",
+ "CaretWidth", "CaretLineFrameWidth", "AutoCompletionSource",
"AutoCompletionThreshold", "AutoCompletionTimeout",
"AutoCompletionCacheSize", "AutoCompletionCacheTime",
"AutoCompletionWatchdogTime", "AutoCompletionMaxLines",
"AutoCompletionMaxChars", "CallTipsVisible",
- "CallTipsStyle", "MarkOccurrencesTimeout",
+ "CallTipsStyle", "MarkOccurrencesTimeout", "SearchRegexpMode",
"AutoSpellCheckChunkSize", "SpellCheckingMinWordSize",
"PostScriptLevel", "EOLMode", "ZoomFactor", "WhitespaceSize",
"OnlineSyntaxCheckInterval", "OnlineChangeTraceInterval",
- "WrapLongLinesMode", "WrapVisualFlag", "CallTipsPosition",
- "VirtualSpaceOptions"]:
+ "WrapLongLinesMode", "WrapVisualFlag", "WrapIndentMode",
+ "WrapStartIndent", "CallTipsPosition", "VirtualSpaceOptions"]:
return int(prefClass.settings.value(
"Editor/" + key, prefClass.editorDefaults[key]))
elif key in ["AdditionalOpenFilters", "AdditionalSaveFilters",
@@ -3183,6 +3189,8 @@
encoding = prefClass.sysDefaults[key]
return encoding
+ return None
+
def setSystem(key, value, prefClass=Prefs):
"""
