mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 23:38: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

9
src/nvim/edit.c
View File

@@ -7244,11 +7244,12 @@ static void ins_del(void)
return;
if (gchar_cursor() == NUL) { /* delete newline */
temp = curwin->w_cursor.col;
if (!can_bs(BS_EOL) /* only if "eol" included */
|| do_join(2, FALSE, TRUE, FALSE) == FAIL)
if (!can_bs(BS_EOL) // only if "eol" included
|| do_join(2, FALSE, TRUE, FALSE, false) == FAIL) {
vim_beep();
else
} else {
curwin->w_cursor.col = temp;
}
} else if (del_char(FALSE) == FAIL) /* delete char under cursor */
vim_beep();
did_ai = FALSE;
@@ -7387,7 +7388,7 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
ptr[len - 1] = NUL;
}
(void)do_join(2, FALSE, FALSE, FALSE);
do_join(2, FALSE, FALSE, FALSE, false);
if (temp == NUL && gchar_cursor() != NUL)
inc_cursor();
} else