0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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)
This commit is contained in:
Bram Moolenaar
2014-04-29 12:15:40 +02:00
parent 33e87789a7
commit d69bd9af3c
16 changed files with 65 additions and 17 deletions

View File

@@ -8685,7 +8685,7 @@ ins_del()
{
temp = curwin->w_cursor.col;
if (!can_bs(BS_EOL) /* only if "eol" included */
|| do_join(2, FALSE, TRUE, FALSE) == FAIL)
|| do_join(2, FALSE, TRUE, FALSE, FALSE) == FAIL)
vim_beep();
else
curwin->w_cursor.col = temp;
@@ -8866,7 +8866,7 @@ ins_bs(c, mode, inserted_space_p)
ptr[len - 1] = NUL;
}
(void)do_join(2, FALSE, FALSE, FALSE);
(void)do_join(2, FALSE, FALSE, FALSE, FALSE);
if (temp == NUL && gchar_cursor() != NUL)
inc_cursor();
}