aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/misc1.c5
-rw-r--r--src/nvim/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 53eceaa4ef..48791384a6 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -1777,6 +1777,9 @@ void changed(void)
if (curbuf->b_may_swap
&& !bt_dontwrite(curbuf)
) {
+ int save_need_wait_return = need_wait_return;
+
+ need_wait_return = false;
ml_open_file(curbuf);
/* The ml_open_file() can cause an ATTENTION message.
@@ -1788,6 +1791,8 @@ void changed(void)
os_delay(2000L, true);
wait_return(TRUE);
msg_scroll = save_msg_scroll;
+ } else {
+ need_wait_return = save_need_wait_return;
}
}
changed_int();
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b0c93533cf..35b13d6e9e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -587,7 +587,7 @@ static int included_patches[] = {
// 1094,
1093,
1092,
- // 1091,
+ 1091,
// 1090,
1089,
1088,