From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 10 Jun 2016 19:52:42 +0000 (+0200)
Subject: patch 7.4.1915
X-Git-Tag: v7.4.1915
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a67ed83a885e8e65e25498660dae4f34d532c7b;p=vim

patch 7.4.1915
Problem:    The effect of the PopupMenu autocommand isn't directly visible.
Solution:   Call gui_update_menus() before displaying the popup menu. (Shane
            Harper, closs #855)
---

diff --git a/src/menu.c b/src/menu.c
index b6f8ce47a..2802de33d 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1970,7 +1970,12 @@ gui_show_popupmenu(void)
 
     /* Only show a popup when it is defined and has entries */
     if (menu != NULL && menu->children != NULL)
+    {
+	/* Update the menus now, in case the MenuPopup autocommand did
+	 * anything. */
+	gui_update_menus(0);
 	gui_mch_show_popupmenu(menu);
+    }
 }
 #endif /* FEAT_GUI */
 
diff --git a/src/version.c b/src/version.c
index 4a2d5378a..1acd1e4cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1915,
 /**/
     1914,
 /**/