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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.983 emacs/src/xdisp.c:1.984
*** emacs/src/xdisp.c:1.983     Mon Feb 21 09:01:04 2005
--- emacs/src/xdisp.c   Tue Feb 22 11:04:18 2005
***************
*** 20775,20781 ****
       have a STOP object and previous row's end glyph came from STOP.  */
    if (!NILP (stop))
      {
!       struct glyph_row *prev = row-1;
        while ((prev = row - 1, prev >= first)
             && MATRIX_ROW_END_CHARPOS (prev) == charpos
             && prev->used[TEXT_AREA] > 0)
--- 20775,20781 ----
       have a STOP object and previous row's end glyph came from STOP.  */
    if (!NILP (stop))
      {
!       struct glyph_row *prev;
        while ((prev = row - 1, prev >= first)
             && MATRIX_ROW_END_CHARPOS (prev) == charpos
             && prev->used[TEXT_AREA] > 0)
***************
*** 20784,20791 ****
          glyph = end + prev->used[TEXT_AREA];
          while (--glyph >= end
                 && INTEGERP (glyph->object));
!         if (glyph >= end
!             && !EQ (stop, glyph->object))
            break;
          row = prev;
        }
--- 20784,20791 ----
          glyph = end + prev->used[TEXT_AREA];
          while (--glyph >= end
                 && INTEGERP (glyph->object));
!         if (glyph < end
!             || !EQ (stop, glyph->object))
            break;
          row = prev;
        }