diff options
| author | Chong Yidong | 2009-04-03 15:10:19 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-04-03 15:10:19 +0000 |
| commit | d52214871ee63038cbdae588656c9b2141456500 (patch) | |
| tree | 76de39fb10f3ddc1413d607fbd77856ed479c7ac /src/term.c | |
| parent | 223509a3a0170623fd9d6019dbdfbc26bde71553 (diff) | |
| download | emacs-d52214871ee63038cbdae588656c9b2141456500.tar.gz emacs-d52214871ee63038cbdae588656c9b2141456500.zip | |
* term.c (produce_stretch_glyph): Reduce width of stretch glyphs
so they don't get wider than the window, matching 2006-01-23
change to the partner function in xdisp.c (Bug#2800).
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c index 6d6bfaf412f..1c686eb521c 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -1740,6 +1740,10 @@ produce_stretch_glyph (it) | |||
| 1740 | if (width <= 0 && (width < 0 || !zero_width_ok_p)) | 1740 | if (width <= 0 && (width < 0 || !zero_width_ok_p)) |
| 1741 | width = 1; | 1741 | width = 1; |
| 1742 | 1742 | ||
| 1743 | if (width > 0 && it->line_wrap != TRUNCATE | ||
| 1744 | && it->current_x + width > it->last_visible_x) | ||
| 1745 | width = it->last_visible_x - it->current_x - 1; | ||
| 1746 | |||
| 1743 | if (width > 0 && it->glyph_row) | 1747 | if (width > 0 && it->glyph_row) |
| 1744 | { | 1748 | { |
| 1745 | Lisp_Object o_object = it->object; | 1749 | Lisp_Object o_object = it->object; |