[Emacs-diffs] Changes to emacs/src/macmenu.c

[Steven Tamm]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.16 emacs/src/macmenu.c:1.17
*** emacs/src/macmenu.c:1.16    Thu Aug 26 18:43:29 2004
--- emacs/src/macmenu.c Mon Aug 30 18:06:21 2004
***************
*** 1807,1815 ****
    /* 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);
        }
      }
  
--- 1807,1815 ----
    /* Get the refcon to find the correct item*/
    if (menu_item_selection)
      {
!       MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
!       if (sel_menu) {
!       GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
        }
      }
  
***************
*** 1831,1841 ****
    {
      int i = MIN_POPUP_SUBMENU_ID;
      MenuHandle submenu = GetMenuHandle (i);
!     while (menu != NULL)
        {
        DeleteMenu (i);
!       DisposeMenu (menu);
!       menu = GetMenuHandle (++i);
        }
    }
  
--- 1831,1841 ----
    {
      int i = MIN_POPUP_SUBMENU_ID;
      MenuHandle submenu = GetMenuHandle (i);
!     while (submenu != NULL)
        {
        DeleteMenu (i);
!       DisposeMenu (submenu);
!       submenu = GetMenuHandle (++i);
        }
    }