To: vim_dev@googlegroups.com
Subject: Patch 9.0.0141
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0141
Problem:    "delmenu" does not remove autocmmands. Running menu test function
            alone fails.
Solution:   Delete autocommands Make sure there is at least one menu.
            (closes #10848)
Files:      runtime/delmenu.vim, src/testdir/test_menu.vim


*** ../vim-9.0.0140/runtime/delmenu.vim	2019-12-10 20:59:43.000000000 +0000
--- runtime/delmenu.vim	2022-08-05 10:42:09.789941382 +0100
***************
*** 7,12 ****
--- 7,37 ----
  aunmenu *
  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_syntax_menu
  
*** ../vim-9.0.0140/src/testdir/test_menu.vim	2022-06-29 21:16:53.641158372 +0100
--- src/testdir/test_menu.vim	2022-08-05 10:49:18.312554202 +0100
***************
*** 160,168 ****
  
  " Test for menu item completion in command line
  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
    menu Dummy.Nothing lll
    for i in range(1, 4)
--- 160,165 ----
***************
*** 369,374 ****
--- 366,375 ----
          \ display: 'tlnoremenu', modes: 'tl', enabled: v:true, silent: v:false,
          \ rhs: ':tlnoremenu<CR>', noremenu: v:true, script: v:false},
          \ menu_info('Test.tlnoremenu', 'tl'))
+ 
+   " Test for getting all the top-level menu names
+   call assert_notequal(menu_info('').submenus, [])
+ 
    aunmenu Test
    tlunmenu Test
    call assert_equal({}, menu_info('Test'))
***************
*** 407,415 ****
          \ shortcut: '', modes: ' ', submenus: ['menu']},
          \ menu_info(']Test'))
    unmenu ]Test
- 
-   " Test for getting all the top-level menu names
-   call assert_notequal(menu_info('').submenus, [])
  endfunc
  
  " Test for <special> keyword in a menu with 'cpo' containing '<'
--- 408,413 ----
*** ../vim-9.0.0140/src/version.c	2022-08-04 18:50:10.882699744 +0100
--- src/version.c	2022-08-05 10:36:57.551460898 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     141,
  /**/

-- 
Eagles may soar, but weasels don't get sucked into jet engines.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///