aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/plines.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/plines.c')
-rw-r--r--src/nvim/plines.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index 97782b39bc..2b8cdd4ad9 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -340,9 +340,17 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp)
*headp = head;
}
+ colnr_T vcol_start = 0; // start from where to consider linebreak
// If 'linebreak' set check at a blank before a non-blank if the line
// needs a break here
- if (wp->w_p_lbr
+ if (wp->w_p_lbr && wp->w_p_wrap && wp->w_width_inner != 0) {
+ char *t = cts->cts_line;
+ while (vim_isbreak((uint8_t)(*t))) {
+ t++;
+ }
+ vcol_start = (colnr_T)(t - cts->cts_line);
+ }
+ if (wp->w_p_lbr && vcol_start <= vcol
&& vim_isbreak((uint8_t)s[0])
&& !vim_isbreak((uint8_t)s[1])
&& wp->w_p_wrap