# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1452869105 -3600
# Node ID e0acbccdf1fc5e179f97fef38cf2cfdd6debc181
# Parent  cb47c1dcfcd3b47c0b6306dc5069b36d9c952e53
commit https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jan 15 15:17:04 2016 +0100

    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
--- 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
--- 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,