summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-10-28 14:58:01 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-10-28 14:58:01 +0400
commit5d3311e5bb8fba7a8151cc79d6651488946ac19d (patch)
treeb235807af76f6a3b7856b5433fef9f45b6c91ef3 /src/xdisp.c
parent6f81ab324c6c62c34b737f93ae54fd7e71ddf59f (diff)
* dispextern.h (struct face): Use bitfields for 'underline_type'
and 'box' members. Remove set-but-unused members 'pixmap_w' and 'pixmap_h'. If not HAVE_WINDOW_SYSTEM, also remove dummy 'stipple' member. Move 'lface' member up to help... * xfaces.c (make_realized_face): ...this function to find and clear just the members that need clearing. (load_face_colors, realize_x_face): * xdisp.c (extend_face_to_end_of_line): Adjust user.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 395a74e412..d62bc6ba96 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18615,7 +18615,9 @@ extend_face_to_end_of_line (struct it *it)
&& MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row)
&& face->box == FACE_NO_BOX
&& face->background == FRAME_BACKGROUND_PIXEL (f)
+#ifdef HAVE_WINDOW_SYSTEM
&& !face->stipple
+#endif
&& !it->glyph_row->reversed_p)
return;