diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-09-21 14:07:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-21 14:07:50 -0700 |
| commit | fd82ce4a3a9c9833e07db079debf6c9b94a2cfd3 (patch) | |
| tree | 30520e000a28c2b2099c641ce33826aea0c07541 /src/nvim/eval.c | |
| parent | b3e56957f8e9468497e5db508d97d7b560ccfe85 (diff) | |
| parent | 111d34849a0670842b56c17c3922dbf0576bb39b (diff) | |
| download | rneovim-fd82ce4a3a9c9833e07db079debf6c9b94a2cfd3.tar.gz rneovim-fd82ce4a3a9c9833e07db079debf6c9b94a2cfd3.tar.bz2 rneovim-fd82ce4a3a9c9833e07db079debf6c9b94a2cfd3.zip | |
Merge #11060 from janlazo/vim-8.1.1783
vim-patch:8.0.{1109,1529,1539,1621,1733,1771,1776},8.1.{1783,2054,2058}
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 7d45787fae..be761afa1f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -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); |