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

[Richard M . Stallman]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1029 emacs/src/xdisp.c:1.1030
*** emacs/src/xdisp.c:1.1029    Thu Jun 30 14:56:02 2005
--- emacs/src/xdisp.c   Sun Jul  3 16:51:02 2005
***************
*** 12740,12750 ****
  
        if ((w->cursor.y < this_scroll_margin
           && CHARPOS (pos) > BEGV)
!         /* Old redisplay didn't take scroll margin into account at the bottom,
!            but then global-hl-line-mode doesn't scroll.  KFS 2004-06-14 */
!         || (w->cursor.y + (make_cursor_line_fully_visible_p
!                            ? cursor_height + this_scroll_margin
!                            : 1)) > it.last_visible_y)
        {
          w->cursor.vpos = -1;
          clear_glyph_matrix (w->desired_matrix);
--- 12740,12750 ----
  
        if ((w->cursor.y < this_scroll_margin
           && CHARPOS (pos) > BEGV)
!         /* rms: considering make_cursor_line_fully_visible_p here
!            seems to give wrong results.  We don't want to recenter
!            when the last line is partly visible, we want to allow
!            that case to be handled in the usual way.  */
!         || (w->cursor.y + 1) > it.last_visible_y)
        {
          w->cursor.vpos = -1;
          clear_glyph_matrix (w->desired_matrix);