# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1557059405 -7200
# Node ID 822d00007b3431729e5dc23119b9a2e87d86f68b
# Parent  92db8323672380e0656d96b919a1a7a1762a059b
patch 8.1.1274: after :unmenu can still execute the menu with :emenu

commit https://github.com/vim/vim/commit/ce79353ace9e21238f13655089363cd23cbb6b32
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun May 5 14:19:20 2019 +0200

    patch 8.1.1274: after :unmenu can still execute the menu with :emenu

    Problem:    After :unmenu can still execute the menu with :emenu.
    Solution:   Do not execute a menu that was disabled for the specified mode.

diff --git a/src/menu.c b/src/menu.c
--- a/src/menu.c
+++ b/src/menu.c
@@ -2337,7 +2337,8 @@ execute_menu(exarg_T *eap, vimmenu_T *me
     if (idx == -1 || eap == NULL)
 	idx = MENU_INDEX_NORMAL;
 
-    if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL)
+    if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL
+						 && (menu->modes & (1 << idx)))
     {
 	/* When executing a script or function execute the commands right now.
 	 * Also for the window toolbar.
diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
--- a/src/testdir/test_menu.vim
+++ b/src/testdir/test_menu.vim
@@ -54,8 +54,23 @@ func Test_menu_commands()
   emenu c Test.FooBar
   call assert_equal('cmdline', g:did_menu)
 
+  nunmenu Test.FooBar
+  call assert_fails('emenu n Test.FooBar', 'E335: Menu not defined for Normal mode')
+  vunmenu Test.FooBar
+  call assert_fails('emenu v Test.FooBar', 'E335: Menu not defined for Visual mode')
+  vmenu 2 Test.FooBar :let g:did_menu = 'visual'<CR>
+  sunmenu Test.FooBar
+  call assert_fails('emenu s Test.FooBar', 'E335: Menu not defined for Select mode')
+  ounmenu Test.FooBar
+  call assert_fails('emenu o Test.FooBar', 'E335: Menu not defined for Op-pending mode')
+  iunmenu Test.FooBar
+  call assert_fails('emenu i Test.FooBar', 'E335: Menu not defined for Insert mode')
+  cunmenu Test.FooBar
+  call assert_fails('emenu c Test.FooBar', 'E335: Menu not defined for Cmdline mode')
+  tlunmenu Test.FooBar
+  call assert_fails('emenu t Test.FooBar', 'E335: Menu not defined for Terminal mode')
+
   aunmenu Test.FooBar
-  tlunmenu Test.FooBar
   call assert_fails('emenu n Test.FooBar', 'E334:')
 
   nmenu 2 Test.FooBar.Child :let g:did_menu = 'foobar'<CR>
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1274,
+/**/
     1273,
 /**/
     1272,