diff options
| author | Eli Zaretskii | 2013-12-19 21:25:13 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-19 21:25:13 +0200 |
| commit | 459457271091c8bb0b6734fe9bd709e86a8c66c1 (patch) | |
| tree | 289485133f5c5352d4a6fd619c8bfb8407ecd2cc | |
| parent | 5df389f5306dfeab21ecb65c42a8054cb27fd8e0 (diff) | |
| download | emacs-459457271091c8bb0b6734fe9bd709e86a8c66c1.tar.gz emacs-459457271091c8bb0b6734fe9bd709e86a8c66c1.zip | |
Fix last commit for TTYs.
| -rw-r--r-- | src/xdisp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index e336ea6c333..b0fcedbd806 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -18955,12 +18955,11 @@ extend_face_to_end_of_line (struct it *it) | |||
| 18955 | it->c = it->char_to_display = ' '; | 18955 | it->c = it->char_to_display = ' '; |
| 18956 | it->len = 1; | 18956 | it->len = 1; |
| 18957 | 18957 | ||
| 18958 | face = FACE_FROM_ID (f, default_face->id); | ||
| 18959 | if (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0 | 18958 | if (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0 |
| 18960 | && (it->glyph_row->used[LEFT_MARGIN_AREA] | 18959 | && (it->glyph_row->used[LEFT_MARGIN_AREA] |
| 18961 | < WINDOW_LEFT_MARGIN_WIDTH (it->w)) | 18960 | < WINDOW_LEFT_MARGIN_WIDTH (it->w)) |
| 18962 | && !it->glyph_row->mode_line_p | 18961 | && !it->glyph_row->mode_line_p |
| 18963 | && face && face->background != FRAME_BACKGROUND_PIXEL (f)) | 18962 | && default_face->background != FRAME_BACKGROUND_PIXEL (f)) |
| 18964 | { | 18963 | { |
| 18965 | struct glyph *g = it->glyph_row->glyphs[LEFT_MARGIN_AREA]; | 18964 | struct glyph *g = it->glyph_row->glyphs[LEFT_MARGIN_AREA]; |
| 18966 | struct glyph *e = g + it->glyph_row->used[LEFT_MARGIN_AREA]; | 18965 | struct glyph *e = g + it->glyph_row->used[LEFT_MARGIN_AREA]; |
| @@ -18990,18 +18989,16 @@ extend_face_to_end_of_line (struct it *it) | |||
| 18990 | it->face_id = default_face->id; | 18989 | it->face_id = default_face->id; |
| 18991 | else | 18990 | else |
| 18992 | it->face_id = face->id; | 18991 | it->face_id = face->id; |
| 18993 | face = FACE_FROM_ID (f, it->face_id); | ||
| 18994 | PRODUCE_GLYPHS (it); | 18992 | PRODUCE_GLYPHS (it); |
| 18995 | 18993 | ||
| 18996 | while (it->current_x <= it->last_visible_x) | 18994 | while (it->current_x <= it->last_visible_x) |
| 18997 | PRODUCE_GLYPHS (it); | 18995 | PRODUCE_GLYPHS (it); |
| 18998 | 18996 | ||
| 18999 | face = FACE_FROM_ID (f, default_face->id); | ||
| 19000 | if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0 | 18997 | if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0 |
| 19001 | && (it->glyph_row->used[RIGHT_MARGIN_AREA] | 18998 | && (it->glyph_row->used[RIGHT_MARGIN_AREA] |
| 19002 | < WINDOW_RIGHT_MARGIN_WIDTH (it->w)) | 18999 | < WINDOW_RIGHT_MARGIN_WIDTH (it->w)) |
| 19003 | && !it->glyph_row->mode_line_p | 19000 | && !it->glyph_row->mode_line_p |
| 19004 | && face && face->background != FRAME_BACKGROUND_PIXEL (f)) | 19001 | && default_face->background != FRAME_BACKGROUND_PIXEL (f)) |
| 19005 | { | 19002 | { |
| 19006 | struct glyph *g = it->glyph_row->glyphs[RIGHT_MARGIN_AREA]; | 19003 | struct glyph *g = it->glyph_row->glyphs[RIGHT_MARGIN_AREA]; |
| 19007 | struct glyph *e = g + it->glyph_row->used[RIGHT_MARGIN_AREA]; | 19004 | struct glyph *e = g + it->glyph_row->used[RIGHT_MARGIN_AREA]; |