From 00672e1d3f59dbff91a18d418b2984be96f89ee5 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 26 Jun 2016 18:38:13 +0200
Subject: patch 7.4.1961 Problem:    When 'insertmode' is reset while doing
 completion the popup menu             remains even though Vim is in Normal
 mode. Solution:   Ignore stop_insert_mode when the popup menu is visible. 
 Don't set             stop_insert_mode when 'insertmode' was already off.
 (Christian             Brabandt)

---
 src/edit.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/edit.c')

diff --git a/src/edit.c b/src/edit.c
index 0ba2627ca..234e03dff 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -649,7 +649,11 @@ edit(
 	if (update_Insstart_orig)
 	    Insstart_orig = Insstart;
 
-	if (stop_insert_mode)
+	if (stop_insert_mode
+#ifdef FEAT_INS_EXPAND
+		&& !pum_visible()
+#endif
+		)
 	{
 	    /* ":stopinsert" used or 'insertmode' reset */
 	    count = 0;
-- 
cgit v1.2.1