diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-12-16 22:16:30 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-16 22:16:30 -0800 |
commit | 1bfccf028673173dd9958930e165e595f36e4601 (patch) | |
tree | 50109ae8d954b84f1d6f4f2bb31d376917c4a72e /src/nvim/normal.c | |
parent | 3de1bc4bf9bd530fbeff74174d4e0ba82f92e9e4 (diff) | |
parent | 9e6ebed6f4c695cfa00710e003d606d5d720b542 (diff) | |
download | rneovim-1bfccf028673173dd9958930e165e595f36e4601.tar.gz rneovim-1bfccf028673173dd9958930e165e595f36e4601.tar.bz2 rneovim-1bfccf028673173dd9958930e165e595f36e4601.zip |
Merge #11556 from janlazo/vim-8.2.0002
vim-patch:8.2.{2,8,10,12,13}
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r-- | src/nvim/normal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index b9dbcc6805..9c5434a0dd 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1553,7 +1553,9 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank) if (!VIsual_active) { if (hasFolding(oap->start.lnum, &oap->start.lnum, NULL)) oap->start.col = 0; - if ((curwin->w_cursor.col > 0 || oap->inclusive) + if ((curwin->w_cursor.col > 0 + || oap->inclusive + || oap->motion_type == kMTLineWise) && hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) { curwin->w_cursor.col = (colnr_T)STRLEN(get_cursor_line_ptr()); |