To: vim_dev@googlegroups.com
Subject: Patch 9.0.0015
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.0015
Problem:    With EXITFREE defined terminal menus are not cleared.
Solution:   Also clear terminal menus. Remove condition that is always true.
            (closes #10641)
Files:      src/alloc.c, src/menu.c


*** ../vim-9.0.0014/src/alloc.c	2022-06-21 22:04:43.000000000 +0100
--- src/alloc.c	2022-07-01 12:09:27.380536169 +0100
***************
*** 402,407 ****
--- 402,408 ----
  # ifdef FEAT_MENU
  	// Clear menus.
  	do_cmdline_cmd((char_u *)"aunmenu *");
+ 	do_cmdline_cmd((char_u *)"tlunmenu *");
  #  ifdef FEAT_MULTI_LANG
  	do_cmdline_cmd((char_u *)"menutranslate clear");
  #  endif
*** ../vim-9.0.0014/src/menu.c	2022-06-16 11:37:36.000000000 +0100
--- src/menu.c	2022-07-01 12:09:27.380536169 +0100
***************
*** 2361,2371 ****
      }
  
      // For the WinBar menu always use the Normal mode menu.
!     if (idx == -1 || eap == NULL)
  	idx = MENU_INDEX_NORMAL;
  
!     if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL
! 						 && (menu->modes & (1 << idx)))
      {
  	// When executing a script or function execute the commands right now.
  	// Also for the window toolbar.
--- 2361,2370 ----
      }
  
      // For the WinBar menu always use the Normal mode menu.
!     if (idx == MENU_INDEX_INVALID || eap == NULL)
  	idx = MENU_INDEX_NORMAL;
  
!     if (menu->strings[idx] != NULL && (menu->modes & (1 << idx)))
      {
  	// When executing a script or function execute the commands right now.
  	// Also for the window toolbar.
*** ../vim-9.0.0014/src/version.c	2022-06-30 22:28:04.069963729 +0100
--- src/version.c	2022-07-01 12:11:12.432189513 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     15,
  /**/

-- 
Give a man a computer program and you give him a headache,
but teach him to program computers and you give him the power
to create headaches for others for the rest of his life...
        R. B. Forest

 /// 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    ///