Merge branch 'stable-2.14'

* stable-2.14:
  Add support for CodeEditor edit config indentWithTabs
  Change lineWrapping from saying false to using prefs.lineWrapping()

Change-Id: I4a94a9179f780a9b31c802478209075c102e7a55
This commit is contained in:
Paladox
2017-07-02 18:43:21 +01:00
7 changed files with 34 additions and 1 deletions

View File

@@ -1527,6 +1527,7 @@ link:#edit-preferences-info[EditPreferencesInfo] entity.
"hide_line_numbers": true,
"match_brackets": true,
"line_wrapping": false,
"indent_with_tabs": false,
"auto_close_brackets": true
}
----
@@ -2430,6 +2431,8 @@ Number of spaces that should be used to display one tab.
Default font size in pixels for change to be displayed in the diff view.
|`line_wrapping` |optional|
Whether to enable line wrapping or not.
|`indent_with_tabs` |optional|
Whether to enable indent with tabs or not.
|===========================================
[[edit-preferences-info]]