summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-10 21:52:42 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-10 21:52:42 +0200
commit2a67ed83a885e8e65e25498660dae4f34d532c7b (patch)
treec02c0dafb870906ce37740187dc7a919d036692a /src
parente429e70f050cb2941f1f8427cf918b68444c904e (diff)
downloadvim-git-2a67ed83a885e8e65e25498660dae4f34d532c7b.tar.gz
patch 7.4.1915v7.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)
Diffstat (limited to 'src')
-rw-r--r--src/menu.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
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
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1915,
+/**/
1914,
/**/
1913,