Mercurial > emacs
changeset 25304:4b75c26bd356
(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.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 17 Aug 1999 00:46:01 +0000 |
| parents | 9cdb001b8bcb |
| children | 273b3c17ce68 |
| files | src/dispnew.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispnew.c Tue Aug 17 00:45:58 1999 +0000 +++ b/src/dispnew.c Tue Aug 17 00:46:01 1999 +0000 @@ -3071,7 +3071,7 @@ /* 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 @@ 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 @@ 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)