diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-04-03 15:10:19 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-04-03 15:10:19 +0000 |
| commit | d52214871ee63038cbdae588656c9b2141456500 (patch) | |
| tree | 76de39fb10f3ddc1413d607fbd77856ed479c7ac | |
| parent | 223509a3a0170623fd9d6019dbdfbc26bde71553 (diff) | |
| download | emacs-d52214871ee63038cbdae588656c9b2141456500.tar.gz | |
* 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).
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/term.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 08be07b117d..2c3075a7044 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-04-03 Chong Yidong <cyd@stupidchicken.com> + + * 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). + 2009-04-03 Kenichi Handa <handa@m17n.org> * print.c (print_object): Make each lowest sub_char_table start a 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) if (width <= 0 && (width < 0 || !zero_width_ok_p)) width = 1; + if (width > 0 && it->line_wrap != TRUNCATE + && it->current_x + width > it->last_visible_x) + width = it->last_visible_x - it->current_x - 1; + if (width > 0 && it->glyph_row) { Lisp_Object o_object = it->object; |