Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change lineWrapping from saying false to using prefs.lineWrapping()

Change-Id: I3e0041720f272c59c9a755708b96ff2b945abe6e
This commit is contained in:
David Pursehouse
2017-07-02 18:40:54 +09:00

View File

@@ -580,7 +580,7 @@ public class EditScreen extends Screen {
.set("indentUnit", prefs.indentUnit())
.set("keyMap", prefs.keyMapType().name().toLowerCase())
.set("lineNumbers", prefs.hideLineNumbers())
.set("lineWrapping", false)
.set("lineWrapping", prefs.lineWrapping())
.set("matchBrackets", prefs.matchBrackets())
.set("mode", mode != null ? mode.mime() : null)
.set("origLeft", editContent)