comparison src/xdisp.c @ 11761:d110042c1d95

(prepare_menu_bars): Save and restore the match data. (update_menu_bar): New arg save_match_data. Maybe save and restore match data here.

11760:898ec89f5379

static int message_log_check_duplicate ();
static void echo_area_display ();
void mark_window_display_accurate ();
static void redisplay_windows ();
static void redisplay_window ();
static void update_menu_bars ();
static void update_menu_bar ();
static void try_window ();
static int try_window_id ();
static struct position *display_text_line ();
static void display_mode_line ();

     This has to be done before any actual redisplay
     or generation of display lines.  */
  if (all_windows)
    {
      Lisp_Object tail, frame;

      FOR_EACH_FRAME (tail, frame)
	{
	  /* If a window on this frame changed size,
	     report that to the user and clear the size-change flag.  */

		  functions = XCONS (functions)->cdr;
		}
	      UNGCPRO;
	    }
	  GCPRO1 (tail);
	  update_menu_bar (XFRAME (frame));
	  UNGCPRO;
	}
    }
  else
    update_menu_bar (selected_frame);

  /* Update all frame titles based on their buffer names, etc.
     We do this after the menu bars so that the frame will first
     create its menu bar using the name `emacs' if no other name
     has yet been specified.  */

    }
}

/* Update the menu bar item list for frame F.
   This has to be done before we start to fill in any display lines,
   because it can call eval.  */

static void
update_menu_bar (f)
     FRAME_PTR f;
{
  struct buffer *old = current_buffer;
  Lisp_Object window;
  register struct window *w;
  window = FRAME_SELECTED_WINDOW (f);
  w = XWINDOW (window);
  
  if (update_mode_lines)
    w->update_mode_line = Qt;

	  || (XFASTINT (w->last_modified) < MODIFF
	      && (XFASTINT (w->last_modified)
		  <= BUF_SAVE_MODIFF (XBUFFER (w->buffer)))))
	{
	  struct buffer *prev = current_buffer;
	  call1 (Vrun_hooks, Qmenu_bar_update_hook);
	  current_buffer = XBUFFER (w->buffer);
	  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
	  current_buffer = prev;
#ifdef USE_X_TOOLKIT
	  set_frame_menubar (f, 0);
#endif /* USE_X_TOOLKIT */
	}
    }
}

int do_id = 1;

11761:d110042c1d95

static int message_log_check_duplicate ();
static void echo_area_display ();
void mark_window_display_accurate ();
static void redisplay_windows ();
static void redisplay_window ();
static void update_menu_bar ();
static void try_window ();
static int try_window_id ();
static struct position *display_text_line ();
static void display_mode_line ();

     This has to be done before any actual redisplay
     or generation of display lines.  */
  if (all_windows)
    {
      Lisp_Object tail, frame;
      int count = specpdl_ptr - specpdl;

      record_unwind_protect (Fstore_match_data, Fmatch_data ());

      FOR_EACH_FRAME (tail, frame)
	{
	  /* If a window on this frame changed size,
	     report that to the user and clear the size-change flag.  */

		  functions = XCONS (functions)->cdr;
		}
	      UNGCPRO;
	    }
	  GCPRO1 (tail);
	  update_menu_bar (XFRAME (frame), 0);
	  UNGCPRO;
	}

      unbind_to (count, Qnil);
    }
  else
    update_menu_bar (selected_frame, 1);

  /* Update all frame titles based on their buffer names, etc.
     We do this after the menu bars so that the frame will first
     create its menu bar using the name `emacs' if no other name
     has yet been specified.  */

    }
}

/* Update the menu bar item list for frame F.
   This has to be done before we start to fill in any display lines,
   because it can call eval.

   If SAVE_MATCH_DATA is 1, we must save and restore it here.  */

static void
update_menu_bar (f, save_match_data)
     FRAME_PTR f;
     int save_match_data;
{
  struct buffer *old = current_buffer;
  Lisp_Object window;
  register struct window *w;

  window = FRAME_SELECTED_WINDOW (f);
  w = XWINDOW (window);
  
  if (update_mode_lines)
    w->update_mode_line = Qt;

	  || (XFASTINT (w->last_modified) < MODIFF
	      && (XFASTINT (w->last_modified)
		  <= BUF_SAVE_MODIFF (XBUFFER (w->buffer)))))
	{
	  struct buffer *prev = current_buffer;
	  int count = specpdl_ptr - specpdl;

	  if (!save_match_data)
	    record_unwind_protect (Fstore_match_data, Fmatch_data ());

	  call1 (Vrun_hooks, Qmenu_bar_update_hook);
	  current_buffer = XBUFFER (w->buffer);
	  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
	  current_buffer = prev;
#ifdef USE_X_TOOLKIT
	  set_frame_menubar (f, 0);
#endif /* USE_X_TOOLKIT */

	  unbind_to (count, Qnil);
	}
    }
}

int do_id = 1;