From c82eb31a5d22353b3a31e247448a44b19a590c05 Mon Sep 17 00:00:00 2001 From: Felipe Morales Date: Fri, 21 Nov 2014 13:21:35 -0300 Subject: vim-patch:7.4.473 vim-patch:7.4.473 Problem: Cursor movement is incorrect when there is a number column/sign/fold column and 'sbr' is displayed. Solution: Adjust the column for 'sbr'. (Christian Brabandt) https://code.google.com/p/vim/source/detail?r=v7-4-473 --- src/nvim/charset.c | 2 ++ src/nvim/version.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nvim/charset.c b/src/nvim/charset.c index f3bb3d8c73..3e37cbdafd 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -1058,6 +1058,8 @@ int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *he if (col >= (colnr_T)wp->w_width) { col -= wp->w_width; numberextra = wp->w_width - (numberextra - win_col_off2(wp)); + if (*p_sbr != NUL && col >= (colnr_T)STRLEN(p_sbr)) + col -= (colnr_T)STRLEN(p_sbr); if (numberextra > 0) { col = col % numberextra; } diff --git a/src/nvim/version.c b/src/nvim/version.c index d2895a14fa..28404c902c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -193,7 +193,7 @@ static int included_patches[] = { //476, //475, //474, - //473, + 473, 472, //471, //470, -- cgit