[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kim F. Storm]

Index: emacs/src/xdisp.c
diff -u emacs/src/xdisp.c:1.1071 emacs/src/xdisp.c:1.1072
--- emacs/src/xdisp.c:1.1071    Sat Jan 21 18:04:09 2006
+++ emacs/src/xdisp.c   Mon Jan 23 13:14:01 2006
@@ -4148,7 +4148,7 @@
        {
          it->method = GET_FROM_STRETCH;
          it->object = value;
-         it->current.pos = it->position = start_pos;
+         *position = it->position = start_pos;
        }
 #ifdef HAVE_WINDOW_SYSTEM
       else
@@ -19671,6 +19671,10 @@
   else
     ascent = (height * FONT_BASE (font)) / FONT_HEIGHT (font);
 
+  if (width > 0 && !it->truncate_lines_p
+      && it->current_x + width > it->last_visible_x)
+    width = it->last_visible_x - it->current_x - 1;
+
   if (width > 0 && height > 0 && it->glyph_row)
     {
       Lisp_Object object = it->stack[it->sp - 1].string;