comparison src/macmenu.c @ 63147:9bde03db5726

* composite.c (compose_chars_in_text): * eval.c (do_autoload): * macmenu.c (set_frame_menubar): * process.c (read_process_output, exec_sentinel): * xmenu.c (set_frame_menubar): * xdisp.c (prepare_menu_bars, update_menu_bar, update_tool_bar): * w32menu.c (set_frame_menubar): Use record_unwind_save_match_data. Rename restore_match_data to restore_search_regs.

63146:7dced3c64549

  EventHandlerUPP handler = NewEventHandlerUPP(menu_quit_handler);
  UInt32 numTypes = 1;
  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),
                               typesList, menu_handle, NULL);
      if (menu_handle) break;

      specbind (Qinhibit_quit, Qt);
      /* Don't let the debugger step into this code
	 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);
	  specbind (Qoverriding_local_map, Qnil);
	}

pop_down_menu (arg)
     Lisp_Object arg;
{
  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;

  BLOCK_INPUT;

                         Fcons (make_save_value (f, 0),
                                make_save_value (&menu, 0)));

  /* 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);

  /* Get the refcon to find the correct item */

63147:9bde03db5726

  EventHandlerUPP handler = NewEventHandlerUPP(menu_quit_handler);
  UInt32 numTypes = 1;
  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),
                               typesList, menu_handle, NULL);
      if (menu_handle) break;

      specbind (Qinhibit_quit, Qt);
      /* Don't let the debugger step into this code
	 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);
	  specbind (Qoverriding_local_map, Qnil);
	}

pop_down_menu (arg)
     Lisp_Object arg;
{
  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;

  BLOCK_INPUT;

                         Fcons (make_save_value (f, 0),
                                make_save_value (&menu, 0)));

  /* 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);

  /* Get the refcon to find the correct item */