diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-10-30 00:49:12 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-10-30 00:49:12 +0300 |
| commit | b29a776550dadefefb891d01054ea21eb942bad1 (patch) | |
| tree | 799bb2c0e926a20ac5b1af262f0849208eae699a /src/nvim/normal.c | |
| parent | 538af1c90a4ac9928f60e97338869e516def4956 (diff) | |
| parent | 45296b331fa462eeabb141037ad10a3ad24ab8a6 (diff) | |
| download | rneovim-b29a776550dadefefb891d01054ea21eb942bad1.tar.gz rneovim-b29a776550dadefefb891d01054ea21eb942bad1.tar.bz2 rneovim-b29a776550dadefefb891d01054ea21eb942bad1.zip | |
Merge branch 'master' into expression-parser
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(); + } } /* |