summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc2.c9
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 000f043e1..0e41be4f5 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4442,7 +4442,8 @@ has_non_ascii(char_u *s)
void
parse_queued_messages(void)
{
- win_T *old_curwin = curwin;
+ int old_curwin_id = curwin->w_id;
+ int old_curbuf_fnum = curbuf->b_fnum;
int i;
int save_may_garbage_collect = may_garbage_collect;
@@ -4494,9 +4495,9 @@ parse_queued_messages(void)
may_garbage_collect = save_may_garbage_collect;
- // If the current window changed we need to bail out of the waiting loop.
- // E.g. when a job exit callback closes the terminal window.
- if (curwin != old_curwin)
+ // If the current window or buffer changed we need to bail out of the
+ // waiting loop. E.g. when a job exit callback closes the terminal window.
+ if (curwin->w_id != old_curwin_id || curbuf->b_fnum != old_curbuf_fnum)
ins_char_typebuf(K_IGNORE);
}
#endif
diff --git a/src/version.c b/src/version.c
index c37955315..e3373bed5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1703,
+/**/
1702,
/**/
1701,