From e24c5b3332b453175e5f73423884087a4aef1247 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar 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) --- runtime/delmenu.vim | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'runtime/delmenu.vim') diff --git a/runtime/delmenu.vim b/runtime/delmenu.vim index 1372182641..040cc09aa9 100644 --- a/runtime/delmenu.vim +++ b/runtime/delmenu.vim @@ -2,30 +2,31 @@ " Warning: This also deletes all menus defined by the user! " " Maintainer: Bram Moolenaar -" Last Change: 2019 Sep 11 +" Last Change: 2019 Dec 10 aunmenu * tlunmenu * -silent! unlet did_install_default_menus -silent! unlet did_install_syntax_menu -if exists("did_menu_trans") +unlet! g:did_install_default_menus +unlet! g:did_install_syntax_menu + +if exists('g:did_menu_trans') menutrans clear - unlet did_menu_trans + unlet g:did_menu_trans endif -silent! unlet find_help_dialog +unlet! g:find_help_dialog -silent! unlet menutrans_help_dialog -silent! unlet menutrans_path_dialog -silent! unlet menutrans_tags_dialog -silent! unlet menutrans_textwidth_dialog -silent! unlet menutrans_fileformat_dialog -silent! unlet menutrans_fileformat_choices -silent! unlet menutrans_no_file -silent! unlet menutrans_set_lang_to -silent! unlet menutrans_spell_change_ARG_to -silent! unlet menutrans_spell_add_ARG_to_word_list -silent! unlet menutrans_spell_ignore_ARG +unlet! g:menutrans_fileformat_choices +unlet! g:menutrans_fileformat_dialog +unlet! g:menutrans_help_dialog +unlet! g:menutrans_no_file +unlet! g:menutrans_path_dialog +unlet! g:menutrans_set_lang_to +unlet! g:menutrans_spell_add_ARG_to_word_list +unlet! g:menutrans_spell_change_ARG_to +unlet! g:menutrans_spell_ignore_ARG +unlet! g:menutrans_tags_dialog +unlet! g:menutrans_textwidth_dialog " vim: set sw=2 : -- cgit v1.2.3