Mercurial > emacs
changeset 27897:a6384a2b5574
(handle_single_display_prop): Use FONT_HEIGHT macro.
(echo_area_display): Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sun, 27 Feb 2000 21:39:46 +0000 |
| parents | 75f296b1a872 |
| children | eed97491259b |
| files | src/xdisp.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)