summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc1.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c
index d1e762c9a..4f36fd80d 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2778,6 +2778,9 @@ changed()
#endif
)
{
+ 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.
@@ -2791,6 +2794,8 @@ changed()
wait_return(TRUE);
msg_scroll = save_msg_scroll;
}
+ else
+ need_wait_return = save_need_wait_return;
}
changed_int();
}
diff --git a/src/version.c b/src/version.c
index 80a0693b2..3c196ad12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1091,
+/**/
1090,
/**/
1089,