From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 19 Oct 1999 16:45:45 +0000 (+0000)
Subject: (echo_area_display) [HAVE_X_WINDOWS]: Do nothing
X-Git-Tag: emacs-pretest-21.0.90~6371
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b5f5bc317a5ae156d91da5851f3e2a323ffb6f68;p=emacs.git

(echo_area_display) [HAVE_X_WINDOWS]: Do nothing
if selected_frame is equal to Vterminal_frame.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 25171792180..debece57c81 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-19  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (echo_area_display) [HAVE_X_WINDOWS]: Do nothing
+	if selected_frame is equal to Vterminal_frame.
+
 1999-10-19  Paul Eggert  <eggert@twinsun.com>
 	
 	Add support for large files, 64-bit Solaris, system locale codings.
diff --git a/src/xdisp.c b/src/xdisp.c
index ebfe075d17d..f01f4b8f8b7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5857,18 +5857,13 @@ echo_area_display (update_frame_p)
   if (!FRAME_VISIBLE_P (f) || !f->glyphs_initialized_p)
     return 0;
 
-#if 0 /* inhibit_window_system is not a valid way of testing
-	 whether a window system is in use.
-	 This code prevents all echo area display
-	 when you run plain `emacs' on a tty.  */
+#ifdef HAVE_X_WINDOWS
   /* When Emacs starts, selected_frame may be a visible terminal
      frame, even if we run under a window system.  If we let this
      through, a message would be displayed on the terminal.  */
-#ifdef HAVE_WINDOW_SYSTEM
-  if (!inhibit_window_system && !FRAME_WINDOW_P (sf))
+  if (EQ (selected_frame, Vterminal_frame))
     return 0;
-#endif /* HAVE_WINDOW_SYSTEM */
-#endif
+#endif /* HAVE_X_WINDOWS */
 
   /* Redraw garbaged frames.  */
   if (frame_garbaged)