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

Merge #11060 from janlazo/vim-8.1.1783

Browse Source 
vim-patch:8.0.{1109,1529,1539,1621,1733,1771,1776},8.1.{1783,2054,2058}
This commit is contained in:
Justin M. Keyes
2019-09-21 14:07:50 -07:00
committed by GitHub
parent b3e56957f8 111d34849a
commit fd82ce4a3a
14 changed files with 168 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval.c
View File

@@ -7004,6 +7004,8 @@ static int assert_equalfile(typval_T *argvars)
break;
}
}
fclose(fd1);
fclose(fd2);
}
}
if (IObuff[0] != NUL) {
@@ -18444,6 +18446,7 @@ static void timer_due_cb(TimeWatcher *tw, void *data)
timer_T *timer = (timer_T *)data;
int save_did_emsg = did_emsg;
int save_called_emsg = called_emsg;
const bool save_ex_pressedreturn = get_pressedreturn();
if (timer->stopped || timer->paused) {
return;
@@ -18472,6 +18475,7 @@ static void timer_due_cb(TimeWatcher *tw, void *data)
}
did_emsg = save_did_emsg;
called_emsg = save_called_emsg;
set_pressedreturn(save_ex_pressedreturn);
if (timer->emsg_count >= 3) {
timer_stop(timer);