From 6396beb432a59c204883f737577a37a4c06a7bc7 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 21 Apr 2016 12:45:15 -0700
Subject: vim-patch:7.4.1091 #4627

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.

https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
---
 src/nvim/misc1.c   | 5 +++++
 src/nvim/version.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 53eceaa4ef..48791384a6 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -1777,6 +1777,9 @@ void changed(void)
     if (curbuf->b_may_swap
         && !bt_dontwrite(curbuf)
         ) {
+      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.
@@ -1788,6 +1791,8 @@ void changed(void)
         os_delay(2000L, true);
         wait_return(TRUE);
         msg_scroll = save_msg_scroll;
+      } else {
+        need_wait_return = save_need_wait_return;
       }
     }
     changed_int();
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b0c93533cf..35b13d6e9e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -587,7 +587,7 @@ static int included_patches[] = {
   // 1094,
   1093,
   1092,
-  // 1091,
+  1091,
   // 1090,
   1089,
   1088,
-- 
cgit