diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:51:52 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:52:01 -0400 |
| commit | dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3 (patch) | |
| tree | bcf0f4d7be21ac0055aa1c091e96caca44046d6e /src/nvim/normal.c | |
| parent | 1b43e5c47e3887696d53573fba7fce6221888794 (diff) | |
| parent | 753401ab4cea8fc81731403fe587558e36e7388f (diff) | |
| download | rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.gz rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.bz2 rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.zip | |
Merge #756 'vim-patch:7.4.267'
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index bdd6a2a266..b505c349ae 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -730,7 +730,7 @@ getcount: } if (text_locked() && (nv_cmds[idx].cmd_flags & NV_NCW)) { - /* This command is not allowed while editing a ccmdline: beep. */ + // This command is not allowed while editing a cmdline: beep. clearopbeep(oap); text_locked_msg(); goto normal_end; @@ -1622,7 +1622,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank) curbuf->b_ml.ml_line_count) beep_flush(); else { - (void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE, TRUE); + do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE, TRUE, true); auto_format(FALSE, TRUE); } break; @@ -7326,7 +7326,7 @@ static void nv_join(cmdarg_T *cap) else { prep_redo(cap->oap->regname, cap->count0, NUL, cap->cmdchar, NUL, NUL, cap->nchar); - (void)do_join(cap->count0, cap->nchar == NUL, TRUE, TRUE); + do_join(cap->count0, cap->nchar == NUL, TRUE, TRUE, true); } } } |