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

Merge pull request #5869 from hardenedapple/undojoin-curhead

Browse Source 
Don't set `b_u_curhead` in `ex_undojoin()`
This commit is contained in:
James McCoy
2017-02-02 12:45:02 -05:00
committed by GitHub
parent 0508192774 e0e4825897
commit e8899178ec
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/undo.c
View File

@@ -2551,20 +2551,20 @@ static void u_add_time(char_u *buf, size_t buflen, time_t tt)
*/
void ex_undojoin(exarg_T *eap)
{
if (curbuf->b_u_newhead == NULL)
return; /* nothing changed before */
if (curbuf->b_u_newhead == NULL) {
return; // nothing changed before
}
if (curbuf->b_u_curhead != NULL) {
EMSG(_("E790: undojoin is not allowed after undo"));
return;
}
if (!curbuf->b_u_synced)
return; /* already unsynced */
if (get_undolevel() < 0)
return; /* no entries, nothing to do */
else {
/* Go back to the last entry */
curbuf->b_u_curhead = curbuf->b_u_newhead;
curbuf->b_u_synced = false; /* no entries, nothing to do */
if (!curbuf->b_u_synced) {
return; // already unsynced
}
if (get_undolevel() < 0) {
return; // no entries, nothing to do
} else {
curbuf->b_u_synced = false; // Append next change to last entry
}
}