[Emacs-diffs] emacs/src ChangeLog term.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/03 15:10:32

Modified files:
        src            : ChangeLog term.c 

Log message:
        * 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).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7465&r2=1.7466
http://cvs.savannah.gnu.org/viewcvs/emacs/src/term.c?cvsroot=emacs&r1=1.238&r2=1.239

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7465
retrieving revision 1.7466
diff -u -b -r1.7465 -r1.7466
--- ChangeLog   3 Apr 2009 06:26:50 -0000       1.7465
+++ ChangeLog   3 Apr 2009 15:10:19 -0000       1.7466
@@ -1,3 +1,9 @@
+2009-04-03  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * print.c (print_object): Make each lowest sub_char_table start a

Index: term.c
===================================================================
RCS file: /sources/emacs/emacs/src/term.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -b -r1.238 -r1.239
--- term.c      27 Mar 2009 16:14:25 -0000      1.238
+++ term.c      3 Apr 2009 15:10:28 -0000       1.239
@@ -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;