diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-16 09:40:22 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-16 09:40:22 +0100 |
| commit | 9e7f1fc2f159d58b2a4cd4b7060bead126fead49 (patch) | |
| tree | ef44950bfd500bf270d6560c49c3f52a91149ee9 /src/diff.c | |
| parent | 6a04bf5ee523b2d6d01d7290e356a30de219f465 (diff) | |
patch 9.1.0183: Wrong display or screenpos() result when toggling diff modev9.1.0183
Problem: Wrong display or screenpos() result when toggling diff mode.
Solution: Reset w_skipcol when disabling 'wrap'. Reset w_leftcol when
enabling 'wrap' (zeertzjq).
fixes: #14210
closes: #14211
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c index e1c8f58de6..c50670cdf5 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1520,6 +1520,7 @@ diff_win_options( if (!wp->w_p_diff) wp->w_p_wrap_save = wp->w_p_wrap; wp->w_p_wrap = FALSE; + wp->w_skipcol = 0; } # ifdef FEAT_FOLDING if (!wp->w_p_diff) @@ -1583,8 +1584,11 @@ ex_diffoff(exarg_T *eap) wp->w_p_crb = wp->w_p_crb_save; if (!(diff_flags & DIFF_FOLLOWWRAP)) { - if (!wp->w_p_wrap) - wp->w_p_wrap = wp->w_p_wrap_save; + if (!wp->w_p_wrap && wp->w_p_wrap_save) + { + wp->w_p_wrap = TRUE; + wp->w_leftcol = 0; + } } #ifdef FEAT_FOLDING free_string_option(wp->w_p_fdm); |