From: Chong Yidong Date: Fri, 22 Jun 2012 07:28:28 +0000 (+0800) Subject: * xdisp.c (x_consider_frame_title): Revert last change. X-Git-Tag: emacs-24.2.90~1199^2~409 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6a92dfe32692a3a0d4023290ecfe169537c31a2;p=emacs.git * xdisp.c (x_consider_frame_title): Revert last change. --- diff --git a/src/ChangeLog b/src/ChangeLog index 128b05e0e7a..a5e10fe9473 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-06-22 Chong Yidong + + * xdisp.c (x_consider_frame_title): Revert last change. + 2012-06-22 Eli Zaretskii * alloc.c (NSTATICS): Enlarge to 0x650. Otherwise, Emacs compiled diff --git a/src/xdisp.c b/src/xdisp.c index dafd22a3fb3..a0739eb5522 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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. */