diff options
| author | Gerd Moellmann <[email protected]> | 1999-08-17 00:46:01 +0000 |
|---|---|---|
| committer | Gerd Moellmann <[email protected]> | 1999-08-17 00:46:01 +0000 |
| commit | f1f134908aa6958e614e2a405ba7d6d7b2716da6 (patch) | |
| tree | 398c6a9096f20777daf4b01a4fbd9b6dee5d1dd5 /src/dispnew.c | |
| parent | c1ff17c59c87515fcd286fc9bf96122028626b3e (diff) | |
(direct_output_for_insert): Use
Vshow_trailing_whitespace instead of former iterator member
show_trailing_whitespace_p.
(direct_output_forward_char): Don't do it if hightlighting
trailing whitespace.
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 07eccf05fb..b2a2d97dd6 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3071,7 +3071,7 @@ direct_output_for_insert (g) /* Give up if highlighting trailing whitespace and we have trailing whitespace in glyph_row. We would have to remove the trailing whitespace face in that case. */ - if (it.show_trailing_whitespace_p + if (!NILP (Vshow_trailing_whitespace) && glyph_row->used[TEXT_AREA]) { struct glyph *last; @@ -3185,7 +3185,7 @@ direct_output_for_insert (g) glyph_row->contains_overlapping_glyphs_p |= it.glyph_row->contains_overlapping_glyphs_p; - if (it.show_trailing_whitespace_p) + if (!NILP (Vshow_trailing_whitespace)) highlight_trailing_whitespace (it.f, glyph_row); /* Write glyphs. If at end of row, we can simply call write_glyphs. @@ -3283,6 +3283,10 @@ direct_output_forward_char (n) if (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)) return 0; + /* Can't use direct output if highlighting trailing whitespace. */ + if (!NILP (Vshow_trailing_whitespace)) + return 0; + row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); if (PT <= MATRIX_ROW_START_BYTEPOS (row) |