diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-07-10 08:10:15 +0800 | 
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-07-10 08:10:15 +0800 | 
| commit | 465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77 (patch) | |
| tree | edae38568202ba41dee4a49f78884da313fd114b /src/nvim/normal.c | |
| parent | 1514cdc7d8863eeee6b04883b1c50aac40048b49 (diff) | |
| parent | 6725667d31591e8025589c4c1df34469f3bfdb52 (diff) | |
| download | rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.gz rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.tar.bz2 rneovim-465bbee520d1b1b57477fd7d80fbdeaf5e1e1e77.zip  | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 39cd2c6631..d891c74fd2 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1451,9 +1451,8 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)      /* Never redo "zf" (define fold). */      if ((vim_strchr(p_cpo, CPO_YANK) != NULL || oap->op_type != OP_YANK)          && ((!VIsual_active || oap->motion_force) -            /* Also redo Operator-pending Visual mode mappings */ -            || (VIsual_active && cap->cmdchar == ':' -                && oap->op_type != OP_COLON)) +            // Also redo Operator-pending Visual mode mappings. +            || (cap->cmdchar == ':' && oap->op_type != OP_COLON))          && cap->cmdchar != 'D'          && oap->op_type != OP_FOLD          && oap->op_type != OP_FOLDOPEN  | 
