diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-10 22:11:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-10 22:11:53 +0100 |
| commit | e24c5b3332b453175e5f73423884087a4aef1247 (patch) | |
| tree | b0786de7591535eda14f17091a9048603779e3f3 /src | |
| parent | 04357fbb87e65e50cc76295aec50114adb5cbd68 (diff) | |
patch 8.1.2416: loading menus sets v:errmsgv8.1.2416
Problem: Loading menus sets v:errmsg.
Solution: Avoid setting v:errmsg and add a test for that. (Jason Franklin)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_menu.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
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 @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2416, +/**/ 2415, /**/ 2414, |