mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-06 05:52:32 -08:00
Code Issues Projects Releases Wiki Activity

(handle_single_display_prop): Use FONT_HEIGHT macro.

Browse source 
(echo_area_display): Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM.
This commit is contained in:
Jason Rumney 2000-02-27 21:39:46 +00:00
parent b65a2f83ec
commit 1ab3e082d0
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/xdisp.c
View file

@ -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)