Commit b6a92dfe authored by Chong Yidong's avatar Chong Yidong

* xdisp.c (x_consider_frame_title): Revert last change.

parent a4c8dd51
2012-06-22 Chong Yidong <cyd@gnu.org>
* xdisp.c (x_consider_frame_title): Revert last change.
2012-06-22 Eli Zaretskii <eliz@gnu.org>
* alloc.c (NSTATICS): Enlarge to 0x650. Otherwise, Emacs compiled
......
......@@ -10967,6 +10967,8 @@ store_mode_line_noprop (const char *string, int field_width, int precision)
Frame Titles
***********************************************************************/
#ifdef HAVE_WINDOW_SYSTEM
/* Set the title of FRAME, if it has changed. The title format is
Vicon_title_format if FRAME is iconified, otherwise it is
frame_title_format. */
......@@ -11037,6 +11039,8 @@ x_consider_frame_title (Lisp_Object frame)
}
}
#endif /* not HAVE_WINDOW_SYSTEM */
/***********************************************************************
Menu Bars
......@@ -11063,6 +11067,7 @@ prepare_menu_bars (void)
/* Update all frame titles based on their buffer names, etc. We do
this before the menu bars so that the buffer-menu will show the
up-to-date frame titles. */
#ifdef HAVE_WINDOW_SYSTEM
if (windows_or_buffers_changed || update_mode_lines)
{
Lisp_Object tail, frame;
......@@ -11075,6 +11080,7 @@ prepare_menu_bars (void)
x_consider_frame_title (frame);
}
}
#endif /* HAVE_WINDOW_SYSTEM */
/* Update the menu bar item lists, if appropriate. This has to be
done before any actual redisplay or generation of display lines. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment