aboutsummaryrefslogtreecommitdiff
path: root/helix-view
diff options
context:
space:
mode:
authorgibbz002023-04-08 12:18:11 +0000
committerGitHub2023-04-08 12:18:11 +0000
commitaf88a3c15cc4ddbb1e2f2ea6492868ffb8aba40b (patch)
tree3b60461b6ea22246d8c2cabf116e6cd9e743d1a2 /helix-view
parente856906f766aa6d58aba6f6bca9e2e1879b1629d (diff)
Fix #6605: Remove soft-wrap.enable option wrapping. (#6656)
Co-authored-by: gibbz00 <gabrielhansson@gmail.com>
Diffstat (limited to 'helix-view')
-rw-r--r--helix-view/src/document.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index eca60026..65a5a6e2 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1444,9 +1444,8 @@ impl Document {
.as_ref()
.and_then(|config| config.soft_wrap.as_ref());
let enable_soft_wrap = language_soft_wrap
- .and_then(|soft_wrap| soft_wrap.enable)
- .or(editor_soft_wrap.enable)
- .unwrap_or(false);
+ .map(|soft_wrap| soft_wrap.enable)
+ .unwrap_or_else(|| editor_soft_wrap.enable);
let max_wrap = language_soft_wrap
.and_then(|soft_wrap| soft_wrap.max_wrap)
.or(config.soft_wrap.max_wrap)