aboutsummaryrefslogtreecommitdiffstats
path: root/src/macmenu.c
diff options
context:
space:
mode:
authorSteven Tamm2004-08-30 18:06:21 +0000
committerSteven Tamm2004-08-30 18:06:21 +0000
commit11715f92de50ee7c004386d9de00b7f3e2df633b (patch)
tree3b708cb8779497558c082f050460e49fc3424852 /src/macmenu.c
parent4f4ce5976e0922de725f83663a7975b387356d86 (diff)
downloademacs-11715f92de50ee7c004386d9de00b7f3e2df633b.tar.gz
emacs-11715f92de50ee7c004386d9de00b7f3e2df633b.zip
macmenu.c (mac_menu_show): Remove shadowing of menu variable
by using different names for inner loop variables.
Diffstat (limited to 'src/macmenu.c')
-rw-r--r--src/macmenu.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/macmenu.c b/src/macmenu.c
index 67e18481a1b..9b09bfb3327 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1807,9 +1807,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
1807 /* Get the refcon to find the correct item*/ 1807 /* Get the refcon to find the correct item*/
1808 if (menu_item_selection) 1808 if (menu_item_selection)
1809 { 1809 {
1810 menu = GetMenuHandle (HiWord (menu_item_choice)); 1810 MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
1811 if (menu) { 1811 if (sel_menu) {
1812 GetMenuItemRefCon (menu, menu_item_selection, &refcon); 1812 GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
1813 } 1813 }
1814 } 1814 }
1815 1815
@@ -1831,11 +1831,11 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
1831 { 1831 {
1832 int i = MIN_POPUP_SUBMENU_ID; 1832 int i = MIN_POPUP_SUBMENU_ID;
1833 MenuHandle submenu = GetMenuHandle (i); 1833 MenuHandle submenu = GetMenuHandle (i);
1834 while (menu != NULL) 1834 while (submenu != NULL)
1835 { 1835 {
1836 DeleteMenu (i); 1836 DeleteMenu (i);
1837 DisposeMenu (menu); 1837 DisposeMenu (submenu);
1838 menu = GetMenuHandle (++i); 1838 submenu = GetMenuHandle (++i);
1839 } 1839 }
1840 } 1840 }
1841 1841