[Emacs-diffs] /srv/bzr/emacs/trunk r108678: * xdisp.c (x_consider_frame_title): Revert last change.

[Chong Yidong]

------------------------------------------------------------
revno: 108678
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-06-22 15:28:28 +0800
message:
  * xdisp.c (x_consider_frame_title): Revert last change.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-22 06:51:06 +0000
+++ b/src/ChangeLog     2012-06-22 07:28:28 +0000
@@ -1,3 +1,7 @@
+2012-06-22  Chong Yidong  <address@hidden>
+
+       * xdisp.c (x_consider_frame_title): Revert last change.
+
 2012-06-22  Eli Zaretskii  <address@hidden>
 
        * alloc.c (NSTATICS): Enlarge to 0x650.  Otherwise, Emacs compiled

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-06-19 06:49:50 +0000
+++ b/src/xdisp.c       2012-06-22 07:28:28 +0000
@@ -10967,6 +10967,8 @@
                             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 @@
     }
 }
 
+#endif /* not HAVE_WINDOW_SYSTEM */
+
 
 /***********************************************************************
                              Menu Bars
@@ -11063,6 +11067,7 @@
   /* 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 @@
            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.  */