vim-patch:9.0.0141: "delmenu" does not remove autocmmands (#19646)

Problem:    "delmenu" does not remove autocmmands. Running menu test function
            alone fails.
Solution:   Delete autocommands Make sure there is at least one menu.
            (closes vim/vim#10848)
206fce307b
This commit is contained in:
Christian Clason 2022-08-05 12:23:41 +02:00 committed by GitHub
parent 7ebcb9b333
commit 21f5aee777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 6 deletions

View File

@ -7,6 +7,31 @@
aunmenu * aunmenu *
tlunmenu * tlunmenu *
if exists('#SetupLazyloadMenus')
au! SetupLazyloadMenus
augroup! SetupLazyloadMenus
endif
if exists('#buffer_list')
au! buffer_list
augroup! buffer_list
endif
if exists('#LoadBufferMenu')
au! LoadBufferMenu
augroup! LoadBufferMenu
endif
if exists('#spellmenu')
au! spellmenu
augroup! spellmenu
endif
if exists('#SpellPopupMenu')
au! SpellPopupMenu
augroup! SpellPopupMenu
endif
unlet! g:did_install_default_menus unlet! g:did_install_default_menus
unlet! g:did_install_syntax_menu unlet! g:did_install_syntax_menu

View File

@ -162,9 +162,6 @@ endfunc
" Test for menu item completion in command line " Test for menu item completion in command line
func Test_menu_expand() func Test_menu_expand()
" Make sure we don't have stale menu items like Buffers menu.
source $VIMRUNTIME/delmenu.vim
" Create the menu itmes for test " Create the menu itmes for test
menu Dummy.Nothing lll menu Dummy.Nothing lll
for i in range(1, 4) for i in range(1, 4)
@ -370,6 +367,10 @@ func Test_menu_info()
\ display: 'tlnoremenu', modes: 'tl', enabled: v:true, silent: v:false, \ display: 'tlnoremenu', modes: 'tl', enabled: v:true, silent: v:false,
\ rhs: ':tlnoremenu<CR>', noremenu: v:true, script: v:false}, \ rhs: ':tlnoremenu<CR>', noremenu: v:true, script: v:false},
\ menu_info('Test.tlnoremenu', 'tl')) \ menu_info('Test.tlnoremenu', 'tl'))
" Test for getting all the top-level menu names
call assert_notequal(menu_info('').submenus, [])
aunmenu Test aunmenu Test
tlunmenu Test tlunmenu Test
call assert_equal({}, menu_info('Test')) call assert_equal({}, menu_info('Test'))
@ -408,9 +409,6 @@ func Test_menu_info()
\ shortcut: '', modes: ' ', submenus: ['menu']}, \ shortcut: '', modes: ' ', submenus: ['menu']},
\ menu_info(']Test')) \ menu_info(']Test'))
unmenu ]Test unmenu ]Test
" Test for getting all the top-level menu names
call assert_notequal(menu_info('').submenus, [])
endfunc endfunc
" Test for <special> keyword in a menu with 'cpo' containing '<' " Test for <special> keyword in a menu with 'cpo' containing '<'