Mercurial > vim
diff src/normal.c @ 5848:75f222d67cea v7.4.267
updated for version 7.4.267
Problem: The '[ mark is in the wrong position after "gq". (Ingo Karkat)
Solution: Add the setmark argument to do_join(). (Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 29 Apr 2014 12:15:40 +0200 |
| parents | 50dbef5e774a |
| children | f59c4bf0ac3b |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -812,7 +812,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; @@ -1905,7 +1905,7 @@ do_pending_operator(cap, old_col, gui_ya else { (void)do_join(oap->line_count, oap->op_type == OP_JOIN, - TRUE, TRUE); + TRUE, TRUE, TRUE); auto_format(FALSE, TRUE); } break; @@ -9236,7 +9236,7 @@ nv_join(cap) { prep_redo(cap->oap->regname, cap->count0, NUL, cap->cmdchar, NUL, NUL, cap->nchar); - (void)do_join(cap->count0, cap->nchar == NUL, TRUE, TRUE); + (void)do_join(cap->count0, cap->nchar == NUL, TRUE, TRUE, TRUE); } } }