From e24c5b3332b453175e5f73423884087a4aef1247 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 10 Dec 2019 22:11:53 +0100
Subject: patch 8.1.2416: loading menus sets v:errmsg

Problem:    Loading menus sets v:errmsg.
Solution:   Avoid setting v:errmsg and add a test for that. (Jason Franklin)
---
 src/testdir/test_menu.vim | 6 ++++++
 src/version.c             | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
index efbb982b04..0d6b78ef71 100644
--- a/src/testdir/test_menu.vim
+++ b/src/testdir/test_menu.vim
@@ -10,7 +10,13 @@ func Test_load_menu()
     call assert_report('error while loading menus: ' . v:exception)
   endtry
   call assert_match('browse confirm w', execute(':menu File.Save'))
+
+  let v:errmsg = ''
+  doautocmd LoadBufferMenu VimEnter
+  call assert_equal('', v:errmsg)
+
   source $VIMRUNTIME/delmenu.vim
+  call assert_equal('', v:errmsg)
 endfunc
 
 func Test_translate_menu()
diff --git a/src/version.c b/src/version.c
index 645631ec0e..18312866ef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2416,
 /**/
     2415,
 /**/
-- 
cgit v1.2.3