IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Jan Edmund Lazo 2018-08-20 21:51:01 -04:00
parent 612f3fd57a
commit ee51061b8c
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/ex_docmd.c
View File

@ -7577,11 +7577,12 @@ static void ex_bang(exarg_T *eap)
*/ */
static void ex_undo(exarg_T *eap) static void ex_undo(exarg_T *eap)
{ {
if (eap->addr_count == 1) /* :undo 123 */ if (eap->addr_count == 1) { // :undo 123
undo_time(eap->line2, false, false, true); undo_time(eap->line2, false, false, true);
else } else {
u_undo(1); u_undo(1);
} }
}
static void ex_wundo(exarg_T *eap) static void ex_wundo(exarg_T *eap)
{ {

25
src/nvim/undo.c
View File

@ -1675,10 +1675,11 @@ void u_undo(int count)
count = 1; count = 1;
} }
if (vim_strchr(p_cpo, CPO_UNDO) == NULL) if (vim_strchr(p_cpo, CPO_UNDO) == NULL) {
undo_undoes = true; undo_undoes = true;
else } else {
undo_undoes = !undo_undoes; undo_undoes = !undo_undoes;
}
u_doit(count, false, true); u_doit(count, false, true);
} }
@ -2020,11 +2021,9 @@ void undo_time(long step, bool sec, bool file, bool absolute)
} }
found: found:
/* If we found it: Follow the path to go to where we want to be. */ // If we found it: Follow the path to go to where we want to be.
if (uhp != NULL || target == 0) { if (uhp != NULL || target == 0) {
/* // First go up the tree as much as needed.
* First go up the tree as much as needed.
*/
while (!got_int) { while (!got_int) {
/* Do the change warning now, for the same reason as above. */ /* Do the change warning now, for the same reason as above. */
change_warning(0); change_warning(0);
@ -2034,9 +2033,11 @@ found:
uhp = curbuf->b_u_newhead; uhp = curbuf->b_u_newhead;
else else
uhp = uhp->uh_next.ptr; uhp = uhp->uh_next.ptr;
if (uhp == NULL || (target > 0 && uhp->uh_walk != mark) if (uhp == NULL
|| (uhp->uh_seq == target && !above)) || (target > 0 && uhp->uh_walk != mark)
|| (uhp->uh_seq == target && !above)) {
break; break;
}
curbuf->b_u_curhead = uhp; curbuf->b_u_curhead = uhp;
u_undoredo(true, true); u_undoredo(true, true);
if (target > 0) { if (target > 0) {
@ -2428,12 +2429,14 @@ static void u_undo_end(
if (absolute && curbuf->b_u_curhead->uh_next.ptr != NULL) { if (absolute && curbuf->b_u_curhead->uh_next.ptr != NULL) {
uhp = curbuf->b_u_curhead->uh_next.ptr; uhp = curbuf->b_u_curhead->uh_next.ptr;
did_undo = false; did_undo = false;
} else if (did_undo) } else if (did_undo) {
uhp = curbuf->b_u_curhead; uhp = curbuf->b_u_curhead;
else } else {
uhp = curbuf->b_u_curhead->uh_next.ptr; uhp = curbuf->b_u_curhead->uh_next.ptr;
} else }
} else {
uhp = curbuf->b_u_newhead; uhp = curbuf->b_u_newhead;
}
if (uhp == NULL) if (uhp == NULL)
*msgbuf = NUL; *msgbuf = NUL;