comparison src/xdisp.c @ 7096:a3bf30f1a408

(syms_of_xdisp): Set up Qmenu_bar_update_hook. (update_menu_bar): Run that hook. Fix failure to update menu bar when w->update_mode_line was nil.

7095:098b87bde5a7

/* String to display for the arrow.  */
Lisp_Object Voverlay_arrow_string;

/* Values of those variables at last redisplay.  */
static Lisp_Object last_arrow_position, last_arrow_string;

/* Nonzero if overlay arrow has been displayed once in this window.  */
static int overlay_arrow_seen;

/* Nonzero means highlight the region even in nonselected windows.  */

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

  /* When we reach a frame's selected window, redo the frame's menu bar.  */
  if (!NILP (w->update_mode_line)
#ifdef USE_X_TOOLKIT
      && FRAME_EXTERNAL_MENU_BAR (f) 
#else
      && FRAME_MENU_BAR_LINES (f) > 0
#endif
      )
    {
      /* If the user has switched buffers or windows, we need to
	 recompute to reflect the new bindings.  But we'll

	 that people can use force-mode-line-update to request
	 that the menu bar be recomputed.  The adverse effect on
	 the rest of the redisplay algorithm is about the same as
	 windows_or_buffers_changed anyway.  */
      if (windows_or_buffers_changed
	  || update_mode_lines
	  || (XFASTINT (w->last_modified) < MODIFF
	      && (XFASTINT (w->last_modified)
		  <= XBUFFER (w->buffer)->save_modified)))
	{
	  struct buffer *prev = current_buffer;
	  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);

}

void
syms_of_xdisp ()
{
  staticpro (&last_arrow_position);
  staticpro (&last_arrow_string);
  last_arrow_position = Qnil;
  last_arrow_string = Qnil;

7096:a3bf30f1a408

/* String to display for the arrow.  */
Lisp_Object Voverlay_arrow_string;

/* Values of those variables at last redisplay.  */
static Lisp_Object last_arrow_position, last_arrow_string;

Lisp_Object Qmenu_bar_update_hook;

/* Nonzero if overlay arrow has been displayed once in this window.  */
static int overlay_arrow_seen;

/* Nonzero means highlight the region even in nonselected windows.  */

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

  if (
#ifdef USE_X_TOOLKIT
      FRAME_EXTERNAL_MENU_BAR (f) 
#else
      FRAME_MENU_BAR_LINES (f) > 0
#endif
      )
    {
      /* If the user has switched buffers or windows, we need to
	 recompute to reflect the new bindings.  But we'll

	 that people can use force-mode-line-update to request
	 that the menu bar be recomputed.  The adverse effect on
	 the rest of the redisplay algorithm is about the same as
	 windows_or_buffers_changed anyway.  */
      if (windows_or_buffers_changed
	  || !NILP (w->update_mode_line)
	  || (XFASTINT (w->last_modified) < MODIFF
	      && (XFASTINT (w->last_modified)
		  <= XBUFFER (w->buffer)->save_modified)))
	{
	  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);

}

void
syms_of_xdisp ()
{
  staticpro (&Qmenu_bar_update_hook);
  Qmenu_bar_update_hook = intern ("menu-bar-update-hook");

  staticpro (&last_arrow_position);
  staticpro (&last_arrow_string);
  last_arrow_position = Qnil;
  last_arrow_string = Qnil;