aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-05-16 10:02:38 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-05-21 16:56:54 -0400
commit63966a9ec240369dba246985779774df2d2cff9c (patch)
tree115d807614d4f2a0d24603387a55601a2a335092 /src/nvim/screen.c
parent04a0486c66e2ae6d67cad990f95283863dbe28fd (diff)
downloadrneovim-63966a9ec240369dba246985779774df2d2cff9c.tar.gz
rneovim-63966a9ec240369dba246985779774df2d2cff9c.tar.bz2
rneovim-63966a9ec240369dba246985779774df2d2cff9c.zip
vim-patch:8.2.0766: display error when using 'number' and 'breakindent'
Problem: Display error when using 'number' and 'breakindent'. Solution: Adjust extra spaces in the first row. (Ken Takata, closes vim/vim#6089, closes vim/vim#5986) https://github.com/vim/vim/commit/e882f7a73c8fa48707de71035eb0a7ccc6ac8548
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 9e958663aa..ba52f5b489 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2994,6 +2994,12 @@ win_line (
c_final = NUL;
n_extra =
get_breakindent_win(wp, ml_get_buf(wp->w_buffer, lnum, false));
+ if (row == startrow) {
+ n_extra -= win_col_off2(wp);
+ if (n_extra < 0) {
+ n_extra = 0;
+ }
+ }
if (wp->w_skipcol > 0 && wp->w_p_wrap && wp->w_briopt_sbr) {
need_showbreak = false;
}