From: Steven Tamm <steventamm@mac.com>
Date: Mon, 30 Aug 2004 18:06:21 +0000 (+0000)
Subject: macmenu.c (mac_menu_show): Remove shadowing of menu variable
X-Git-Tag: ttn-vms-21-2-B4~5140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11715f92de50ee7c004386d9de00b7f3e2df633b;p=emacs.git

macmenu.c (mac_menu_show): Remove shadowing of menu variable
by using different names for inner loop variables.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7779dddb124..e45f9b6e563 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
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)
   /* 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);
       }
   }