From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 15 Jan 2016 14:17:04 +0000 (+0100)
Subject: patch 7.4.1091
X-Git-Tag: v7.4.1091
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b01f357791f88c7083e58cf2b36509dd83f21ea2;p=vim

patch 7.4.1091
Problem:    When making a change while need_wait_return is set there is a two
            second delay.
Solution:   Do not assume the ATTENTION prompt was given when need_wait_return
            was set already.
---

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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1091,
 /**/
     1090,
 /**/