mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 15:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.267

Browse Source 
Problem:    The '[ mark is in the wrong position after "gq". (Ingo Karkat)
Solution:   Add the setmark argument to do_join(). (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=75f222d67cea335efbe0274de6340dba174c1e7e
This commit is contained in:
oni-link
2014-05-22 14:37:27 +02:00
committed by Justin M. Keyes
parent 1b43e5c47e
commit 753401ab4c
10 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/normal.c
View File

@@ -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);
}
}
}