• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révision5f003938334086c07cf6c6acb4f88da70195635d (tree)
l'heure2022-07-01 20:15:04
AuteurBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Message de Log

patch 9.0.0015: with EXITFREE defined terminal menus are not cleared

Commit: https://github.com/vim/vim/commit/79ae152697ed0dfa578cfac305d05021dec2a6bc
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Jul 1 12:13:15 2022 +0100

patch 9.0.0015: with EXITFREE defined terminal menus are not cleared
Problem: With EXITFREE defined terminal menus are not cleared.
Solution: Also clear terminal menus. Remove condition that is always true.
(closes #10641)

Change Summary

Modification

diff -r a56121c09252 -r 5f0039383340 src/alloc.c
--- a/src/alloc.c Thu Jun 30 23:30:03 2022 +0200
+++ b/src/alloc.c Fri Jul 01 13:15:04 2022 +0200
@@ -402,6 +402,7 @@
402402 # ifdef FEAT_MENU
403403 // Clear menus.
404404 do_cmdline_cmd((char_u *)"aunmenu *");
405+ do_cmdline_cmd((char_u *)"tlunmenu *");
405406 # ifdef FEAT_MULTI_LANG
406407 do_cmdline_cmd((char_u *)"menutranslate clear");
407408 # endif
diff -r a56121c09252 -r 5f0039383340 src/menu.c
--- a/src/menu.c Thu Jun 30 23:30:03 2022 +0200
+++ b/src/menu.c Fri Jul 01 13:15:04 2022 +0200
@@ -2361,11 +2361,10 @@
23612361 }
23622362
23632363 // For the WinBar menu always use the Normal mode menu.
2364- if (idx == -1 || eap == NULL)
2364+ if (idx == MENU_INDEX_INVALID || eap == NULL)
23652365 idx = MENU_INDEX_NORMAL;
23662366
2367- if (idx != MENU_INDEX_INVALID && menu->strings[idx] != NULL
2368- && (menu->modes & (1 << idx)))
2367+ if (menu->strings[idx] != NULL && (menu->modes & (1 << idx)))
23692368 {
23702369 // When executing a script or function execute the commands right now.
23712370 // Also for the window toolbar.
diff -r a56121c09252 -r 5f0039383340 src/version.c
--- a/src/version.c Thu Jun 30 23:30:03 2022 +0200
+++ b/src/version.c Fri Jul 01 13:15:04 2022 +0200
@@ -736,6 +736,8 @@
736736 static int included_patches[] =
737737 { /* Add new patch number below this line */
738738 /**/
739+ 15,
740+/**/
739741 14,
740742 /**/
741743 13,
Afficher sur ancien navigateur de dépôt.