diff options
| author | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
| commit | 6566251d144d2c9c9e08e05c8c3a3fe9915a19b8 (patch) | |
| tree | 980fd0c7287e295c8ac72858b0794f72224415e0 /src/nvim/cursor.c | |
| parent | 9c4223215f71e1212462ada4e698be1b31437dd9 (diff) | |
| parent | 9f3d483c79f03c48239fdc82cc02e8685a03d22a (diff) | |
| download | rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.gz rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.bz2 rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.zip | |
Merge remote-tracking branch 'upstream/master' into libcall
Diffstat (limited to 'src/nvim/cursor.c')
| -rw-r--r-- | src/nvim/cursor.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c index f2b3cfe690..036ae32589 100644 --- a/src/nvim/cursor.c +++ b/src/nvim/cursor.c @@ -93,11 +93,12 @@ int coladvance(colnr_T wcol) static int coladvance2( pos_T *pos, - bool addspaces, /* change the text to achieve our goal? */ - bool finetune, /* change char offset for the exact column */ - colnr_T wcol /* column to move to */ + bool addspaces, // change the text to achieve our goal? + bool finetune, // change char offset for the exact column + colnr_T wcol_arg // column to move to (can be negative) ) { + colnr_T wcol = wcol_arg; int idx; char_u *ptr; char_u *line; @@ -165,6 +166,7 @@ static int coladvance2( if (virtual_active() && addspaces + && wcol >= 0 && ((col != wcol && col != wcol + 1) || csize > 1)) { /* 'virtualedit' is set: The difference between wcol and col is * filled with spaces. */ @@ -244,8 +246,9 @@ static int coladvance2( mark_mb_adjustpos(curbuf, pos); } - if (col < wcol) + if (wcol < 0 || col < wcol) { return FAIL; + } return OK; } |