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 d1e762c9a7243aa6771880b8b6e3afb435a42d22..4f36fd80d1c18143b7c2a5f17791aa58ab19b2bd 100644 (file)
--- 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 80a0693b2f3668baa8d741436b656b80e9af6fe2..3c196ad12f9745e3e1f4772d69f3be71f02de085 100644 (file)
--- 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,
 /**/