# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1465588806 -7200
# Node ID b0be59a89bdebea58993b0b0a934abc32b046620
# Parent  25a3eae753aa828655fad432c4029354f85decd5
commit https://github.com/vim/vim/commit/2a67ed83a885e8e65e25498660dae4f34d532c7b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jun 10 21:52:42 2016 +0200

    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 https://github.com/vim/vim/issues/855)

diff --git a/src/menu.c b/src/menu.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1915,
+/**/
     1914,
 /**/
     1913,