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

[Kim F . Storm]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.28 emacs/src/macmenu.c:1.29
*** emacs/src/macmenu.c:1.28    Mon Jun  6 20:24:13 2005
--- emacs/src/macmenu.c Wed Jun  8 22:33:36 2005
***************
*** 1406,1412 ****
    EventTypeSpec typesList[] = { { kEventClassKeyboard, kEventRawKeyDown } };
    int i = MIN_MENU_ID;
    MenuHandle menu = menu_handle ? menu_handle : GetMenuHandle (i);
!     
    while (menu != NULL)
      {
        InstallMenuEventHandler (menu, handler, GetEventTypeCount (typesList),
--- 1406,1412 ----
    EventTypeSpec typesList[] = { { kEventClassKeyboard, kEventRawKeyDown } };
    int i = MIN_MENU_ID;
    MenuHandle menu = menu_handle ? menu_handle : GetMenuHandle (i);
! 
    while (menu != NULL)
      {
        InstallMenuEventHandler (menu, handler, GetEventTypeCount (typesList),
***************
*** 1475,1481 ****
         because it is not reentrant.  */
        specbind (Qdebug_on_next_call, Qnil);
  
!       record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
        if (NILP (Voverriding_local_map_menu_flag))
        {
          specbind (Qoverriding_terminal_local_map, Qnil);
--- 1475,1481 ----
         because it is not reentrant.  */
        specbind (Qdebug_on_next_call, Qnil);
  
!       record_unwind_save_match_data ();
        if (NILP (Voverriding_local_map_menu_flag))
        {
          specbind (Qoverriding_terminal_local_map, Qnil);
***************
*** 1676,1682 ****
  {
    struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
    struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
!   
    FRAME_PTR f = p1->pointer;
    MenuHandle *menu = p2->pointer;
  
--- 1676,1682 ----
  {
    struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
    struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
! 
    FRAME_PTR f = p1->pointer;
    MenuHandle *menu = p2->pointer;
  
***************
*** 1955,1961 ****
  
    /* Add event handler so we can detect C-g. */
    install_menu_quit_handler (menu);
!   
    /* Display the menu.  */
    menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0);
    menu_item_selection = LoWord (menu_item_choice);
--- 1955,1961 ----
  
    /* Add event handler so we can detect C-g. */
    install_menu_quit_handler (menu);
! 
    /* Display the menu.  */
    menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0);
    menu_item_selection = LoWord (menu_item_choice);