[Emacs-diffs] trunk r115615: Fix last commit for TTYs.

[Eli Zaretskii]

------------------------------------------------------------
revno: 115615
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-19 21:25:13 +0200
message:
  Fix last commit for TTYs.
modified:
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-12-19 19:06:53 +0000
+++ b/src/xdisp.c       2013-12-19 19:25:13 +0000
@@ -18955,12 +18955,11 @@
       it->c = it->char_to_display = ' ';
       it->len = 1;
 
-      face = FACE_FROM_ID (f, default_face->id);
       if (WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0
          && (it->glyph_row->used[LEFT_MARGIN_AREA]
              < WINDOW_LEFT_MARGIN_WIDTH (it->w))
          && !it->glyph_row->mode_line_p
-         && face && face->background != FRAME_BACKGROUND_PIXEL (f))
+         && default_face->background != FRAME_BACKGROUND_PIXEL (f))
        {
          struct glyph *g = it->glyph_row->glyphs[LEFT_MARGIN_AREA];
          struct glyph *e = g + it->glyph_row->used[LEFT_MARGIN_AREA];
@@ -18990,18 +18989,16 @@
        it->face_id = default_face->id;
       else
        it->face_id = face->id;
-      face = FACE_FROM_ID (f, it->face_id);
       PRODUCE_GLYPHS (it);
 
       while (it->current_x <= it->last_visible_x)
        PRODUCE_GLYPHS (it);
 
-      face = FACE_FROM_ID (f, default_face->id);
       if (WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0
          && (it->glyph_row->used[RIGHT_MARGIN_AREA]
              < WINDOW_RIGHT_MARGIN_WIDTH (it->w))
          && !it->glyph_row->mode_line_p
-         && face && face->background != FRAME_BACKGROUND_PIXEL (f))
+         && default_face->background != FRAME_BACKGROUND_PIXEL (f))
        {
          struct glyph *g = it->glyph_row->glyphs[RIGHT_MARGIN_AREA];
          struct glyph *e = g + it->glyph_row->used[RIGHT_MARGIN_AREA];