Mercurial > emacs
changeset 102831:1f0beb33697b
* 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).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 03 Apr 2009 15:10:19 +0000 |
| parents | bad1ab950d0c |
| children | 9e5e877e0fd8 |
| files | src/ChangeLog src/term.c |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 03 06:26:50 2009 +0000 +++ b/src/ChangeLog Fri Apr 03 15:10:19 2009 +0000 @@ -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
--- a/src/term.c Fri Apr 03 06:26:50 2009 +0000 +++ b/src/term.c Fri Apr 03 15:10:19 2009 +0000 @@ -1740,6 +1740,10 @@ 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;