(handle_single_display_prop): Use FONT_HEIGHT macro.

(echo_area_display): Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM.

diff --git a/src/xdisp.c b/src/xdisp.c
index 22ce92b739b8e0266986f7350af9c0f1ee39b99b..5acc58d0d30c101452332b4ca929ded702f0b71e 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2439,7 +2439,7 @@ handle_single_display_prop (it, prop, object, position)
        {
          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 @@ echo_area_display (update_frame_p)
   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)