# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 951687586 0
# Node ID a6384a2b5574dcca74c0cbbcf4d4cc83c2d8c3c5
# Parent  75f296b1a872931244cae185301ff6008315f1f1
(handle_single_display_prop): Use FONT_HEIGHT macro.
(echo_area_display): Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM.

diff -r 75f296b1a872 -r a6384a2b5574 src/xdisp.c
--- a/src/xdisp.c	Sun Feb 27 21:38:00 2000 +0000
+++ b/src/xdisp.c	Sun Feb 27 21:39:46 2000 +0000
@@ -2439,7 +2439,7 @@
 	{
 	  struct face *face = FACE_FROM_ID (it->f, it->face_id);
 	  it->voffset = - (XFLOATINT (value)
-			   * (face->font->ascent + face->font->descent));
+			   * (FONT_HEIGHT (face->font)));
 	}
 #endif /* HAVE_WINDOW_SYSTEM */
     }
@@ -5988,14 +5988,14 @@
   if (!FRAME_VISIBLE_P (f) || !f->glyphs_initialized_p)
     return 0;
 
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
   /* 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.  */
   if (EQ (selected_frame, Vterminal_frame) 
       && !NILP (Vwindow_system))
     return 0;
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
 
   /* Redraw garbaged frames.  */
   if (frame_garbaged)