comparison src/xdisp.c @ 83635:9c01792a3ce8

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 793-802) - Update from CVS - Remove RCS keywords - Merge from emacs--rel--22 * emacs--rel--22 (patch 42-50) - Update from CVS - Merge from gnus--rel--5.10 - Gnus ChangeLog tweaks * gnus--rel--5.10 (patch 229-232) - Merge from emacs--devo--0, emacs--rel--22 - ChangeLog tweak - Update from CVS Revision: [e-mail]/emacs--multi-tty--0--patch-23

83634:391cce03f832

static void
update_tool_bar (f, save_match_data)
     struct frame *f;
     int save_match_data;
{
#ifdef USE_GTK
  int do_update = FRAME_EXTERNAL_TOOL_BAR (f);
#else
  int do_update = WINDOWP (f->tool_bar_window)
    && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)) > 0;
#endif

{
  struct window *w;
  struct it it;
  struct glyph_row *row;

#ifdef USE_GTK
  if (FRAME_EXTERNAL_TOOL_BAR (f))
    update_frame_tool_bar (f);
  return 0;
#endif

        display_menu_bar (w);

#ifdef HAVE_WINDOW_SYSTEM
      if (FRAME_WINDOW_P (f))
        {
#ifdef USE_GTK
          redisplay_tool_bar_p = FRAME_EXTERNAL_TOOL_BAR (f);
#else
          redisplay_tool_bar_p = WINDOWP (f->tool_bar_window)
            && (FRAME_TOOL_BAR_LINES (f) > 0
                || !NILP (Vauto_resize_tool_bars));

83635:9c01792a3ce8

static void
update_tool_bar (f, save_match_data)
     struct frame *f;
     int save_match_data;
{
#if defined (USE_GTK) || USE_MAC_TOOLBAR
  int do_update = FRAME_EXTERNAL_TOOL_BAR (f);
#else
  int do_update = WINDOWP (f->tool_bar_window)
    && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)) > 0;
#endif

{
  struct window *w;
  struct it it;
  struct glyph_row *row;

#if defined (USE_GTK) || USE_MAC_TOOLBAR
  if (FRAME_EXTERNAL_TOOL_BAR (f))
    update_frame_tool_bar (f);
  return 0;
#endif

        display_menu_bar (w);

#ifdef HAVE_WINDOW_SYSTEM
      if (FRAME_WINDOW_P (f))
        {
#if defined (USE_GTK) || USE_MAC_TOOLBAR
          redisplay_tool_bar_p = FRAME_EXTERNAL_TOOL_BAR (f);
#else
          redisplay_tool_bar_p = WINDOWP (f->tool_bar_window)
            && (FRAME_TOOL_BAR_LINES (f) > 0
                || !NILP (Vauto_resize_tool_bars));