diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-10-21 04:17:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 04:17:23 +0200 |
| commit | d7594f9c33d1a855a5a071e6191e3ccd0a0b44ee (patch) | |
| tree | abe6b2b203676374c331aa114753e8b80687c7c0 /src/nvim/normal.c | |
| parent | a3a9ef9ad4ecf6ee1db98148d165755043d3ff04 (diff) | |
| parent | b5b8966760773421b285ee8b63015fc767bca18d (diff) | |
| download | rneovim-d7594f9c33d1a855a5a071e6191e3ccd0a0b44ee.tar.gz rneovim-d7594f9c33d1a855a5a071e6191e3ccd0a0b44ee.tar.bz2 rneovim-d7594f9c33d1a855a5a071e6191e3ccd0a0b44ee.zip | |
Merge #7420 'vim-patch:8.0.0962, 8.0.1019'
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index c40ed58550..1103fe15d2 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1548,8 +1548,10 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank) } oap->start = VIsual; - if (VIsual_mode == 'V') + if (VIsual_mode == 'V') { oap->start.col = 0; + oap->start.coladd = 0; + } } /* @@ -6260,15 +6262,18 @@ static void nv_gomark(cmdarg_T *cap) } else nv_cursormark(cap, cap->arg, pos); - /* May need to clear the coladd that a mark includes. */ - if (!virtual_active()) + // May need to clear the coladd that a mark includes. + if (!virtual_active()) { curwin->w_cursor.coladd = 0; + } + check_cursor_col(); if (cap->oap->op_type == OP_NOP && pos != NULL && (pos == (pos_T *)-1 || !equalpos(old_cursor, *pos)) && (fdo_flags & FDO_MARK) - && old_KeyTyped) + && old_KeyTyped) { foldOpenCursor(); + } } /* |