mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

macmenu.c (mac_menu_show): Remove shadowing of menu variable

Browse Source 
by using different names for inner loop variables.
This commit is contained in:
Steven Tamm 2004-08-30 18:06:21 +00:00
parent 4f4ce5976e
commit 11715f92de
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2004-08-30 Steven Tamm <steventamm@mac.com>
* macmenu.c (mac_menu_show): Remove shadowing of menu variable
by using different names for inner loop variables.
2004-08-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection

12
src/macmenu.c
View File

@ -1807,9 +1807,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
/* Get the refcon to find the correct item*/
if (menu_item_selection)
{
menu = GetMenuHandle (HiWord (menu_item_choice));
if (menu) {
GetMenuItemRefCon (menu, menu_item_selection, &refcon);
MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
if (sel_menu) {
GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
}
}
@ -1831,11 +1831,11 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
{
int i = MIN_POPUP_SUBMENU_ID;
MenuHandle submenu = GetMenuHandle (i);
while (menu != NULL)
while (submenu != NULL)
{
DeleteMenu (i);
DisposeMenu (menu);
menu = GetMenuHandle (++i);
DisposeMenu (submenu);
submenu = GetMenuHandle (++i);
}
}