mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 13:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.269

Browse Source 
Problem:  CTRL-U in Insert mode does not work after using a cursor key.
          (Pine Wu)
Solution: Use the original insert start position. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=81c26975e8f9dc7435353581346542409403f296
This commit is contained in:
Marco Hinz
2014-04-29 15:34:02 +02:00
committed by Thiago de Arruda
parent 35ca066039
commit 48fa2be92b
4 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/edit.c
View File

@@ -7339,8 +7339,8 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
((curwin->w_cursor.lnum == 1 && curwin->w_cursor.col == 0)
|| (!can_bs(BS_START)
&& (arrow_used
|| (curwin->w_cursor.lnum == Insstart.lnum
&& curwin->w_cursor.col <= Insstart.col)))
|| (curwin->w_cursor.lnum == Insstart_orig.lnum
&& curwin->w_cursor.col <= Insstart_orig.col)))
|| (!can_bs(BS_INDENT) && !arrow_used && ai_col > 0
&& curwin->w_cursor.col <= ai_col)
|| (!can_bs(BS_EOL) && curwin->w_cursor.col == 0)))) {
@@ -7378,15 +7378,14 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
* delete newline!
*/
if (curwin->w_cursor.col == 0) {
lnum = Insstart.lnum;
if (curwin->w_cursor.lnum == Insstart.lnum
|| revins_on
) {
lnum = Insstart_orig.lnum;
if (curwin->w_cursor.lnum == lnum || revins_on) {
if (u_save((linenr_T)(curwin->w_cursor.lnum - 2),
(linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL)
(linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL) {
return FALSE;
--Insstart.lnum;
Insstart.col = MAXCOL;
}
--Insstart_orig.lnum;
Insstart_orig.col = MAXCOL;
}
/*
* In replace mode:
@@ -7517,9 +7516,10 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
/* insert extra spaces until we are at want_vcol */
while (vcol < want_vcol) {
/* Remember the first char we inserted */
if (curwin->w_cursor.lnum == Insstart.lnum
&& curwin->w_cursor.col < Insstart.col)
Insstart.col = curwin->w_cursor.col;
if (curwin->w_cursor.lnum == Insstart_orig.lnum
&& curwin->w_cursor.col < Insstart_orig.col) {
Insstart_orig.col = curwin->w_cursor.col;
}
if (State & VREPLACE_FLAG)
ins_char(' ');
@@ -7584,8 +7584,8 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
} while (
revins_on ||
(curwin->w_cursor.col > mincol
&& (curwin->w_cursor.lnum != Insstart.lnum
|| curwin->w_cursor.col != Insstart.col)));
&& (curwin->w_cursor.lnum != Insstart_orig.lnum
|| curwin->w_cursor.col != Insstart_orig.col)));
did_backspace = TRUE;
}
did_si = FALSE;
@@ -7601,9 +7601,10 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
AppendCharToRedobuff(c);
/* If deleted before the insertion point, adjust it */
if (curwin->w_cursor.lnum == Insstart.lnum
&& curwin->w_cursor.col < Insstart.col)
Insstart.col = curwin->w_cursor.col;
if (curwin->w_cursor.lnum == Insstart_orig.lnum
&& curwin->w_cursor.col < Insstart_orig.col) {
Insstart_orig.col = curwin->w_cursor.col;
}
/* vi behaviour: the cursor moves backward but the character that
* was there remains visible