diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-23 13:04:50 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-23 21:17:00 +0100 |
| commit | 0a20cd7f50c956044ebb204349491076e5424891 (patch) | |
| tree | ff540176368f620975cb390f2a6cba20047f8aa7 /src | |
| parent | 598f69b05e7a76597331a2d8174f27d10d673f18 (diff) | |
| download | rneovim-0a20cd7f50c956044ebb204349491076e5424891.tar.gz rneovim-0a20cd7f50c956044ebb204349491076e5424891.tar.bz2 rneovim-0a20cd7f50c956044ebb204349491076e5424891.zip | |
vim-patch:7.4.489
Problem: Cursor movement still wrong when 'lbr' is set and there is a
number column. (Hirohito Higashi)
Solution: Add correction for number column. (Hiroyuki Takagi)
https://code.google.com/p/vim/source/detail?r=v7-4-489
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/charset.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 9e5194a5df..32427cc3ba 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -1058,6 +1058,9 @@ 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 (numberextra > 0) { + col %= numberextra; + } if (*p_sbr != NUL) { colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr); if (col >= sbrlen) diff --git a/src/nvim/version.c b/src/nvim/version.c index 81601e8d8f..c4529265cc 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -249,7 +249,7 @@ static int included_patches[] = { //492, 491, //490, - //489, + 489, //488, //487, //486, |