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

[Andreas Schwab]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.832 emacs/src/xdisp.c:1.833
*** emacs/src/xdisp.c:1.832     Sun May 25 13:47:48 2003
--- emacs/src/xdisp.c   Mon May 26 18:06:33 2003
***************
*** 12881,12887 ****
         the window end again, since its offset from Z hasn't changed.  */
        r0 = MATRIX_FIRST_TEXT_ROW (current_matrix);
        if (CHARPOS (start) == MATRIX_ROW_START_CHARPOS (r0) + delta
!         && BYTEPOS (start) == MATRIX_ROW_START_BYTEPOS (r0) + delta_bytes)
        {
          /* Adjust positions in the glyph matrix.  */
          if (delta || delta_bytes)
--- 12881,12890 ----
         the window end again, since its offset from Z hasn't changed.  */
        r0 = MATRIX_FIRST_TEXT_ROW (current_matrix);
        if (CHARPOS (start) == MATRIX_ROW_START_CHARPOS (r0) + delta
!         && BYTEPOS (start) == MATRIX_ROW_START_BYTEPOS (r0) + delta_bytes
!         /* PT must not be in a partially visible line.  */
!         && !(PT >= MATRIX_ROW_START_CHARPOS (row) + delta
!              && MATRIX_ROW_BOTTOM_Y (row) > window_text_bottom_y (w)))
        {
          /* Adjust positions in the glyph matrix.  */
          if (delta || delta_bytes)
***************
*** 12926,12932 ****
         as is, without changing glyph positions since no text has
         been added/removed in front of the window end.  */
        r0 = MATRIX_FIRST_TEXT_ROW (current_matrix);
!       if (TEXT_POS_EQUAL_P (start, r0->start.pos))
        {
          /* We have to compute the window end anew since text
             can have been added/removed after it.  */
--- 12929,12938 ----
         as is, without changing glyph positions since no text has
         been added/removed in front of the window end.  */
        r0 = MATRIX_FIRST_TEXT_ROW (current_matrix);
!       if (TEXT_POS_EQUAL_P (start, r0->start.pos)
!         /* PT must not be in a partially visible line.  */
!         && !(PT >= MATRIX_ROW_START_CHARPOS (row)
!              && MATRIX_ROW_BOTTOM_Y (row) > window_text_bottom_y (w)))
        {
          /* We have to compute the window end anew since text
             can have been added/removed after it.  */