Re: [az@ftc.ru: hl-line-mode conflicts with scroll-margin]

[storm@cua.dk (Kim F. Storm)]

Richard Stallman <rms@gnu.org> writes:

> [I sent this message a week ago but did not get a response.]
>
> This could be a redisplay bug.  Can someone who has
> worked on redisplay take a look at it?
>
> From: Eugeny Korekin <az@ftc.ru>
> Subject: hl-line-mode conflicts with scroll-margin
> To: emacs-pretest-bug@gnu.org
> Date: Wed,  2 Jun 2004 14:54:29 +0700 (NOVST)
>
> Symptoms:
>
> When hl-line-mode is turned on scroll-margin setting
> affects only scrolling up, but does not affects scrolling down
> (margin is only at top of window)
>


The following patch solves the problem.

But the comment in the old code says this was done deliberately.
So I don't know if the fix breaks something else...



*** xdisp.c	30 May 2004 23:13:12 +0200	1.892
--- xdisp.c	14 Jun 2004 14:09:23 +0200
***************
*** 13372,13380 ****

      if ((w->cursor.y < this_scroll_margin
  	 && CHARPOS (start) > BEGV)
! 	/* Don't take scroll margin into account at the bottom because
! 	   old redisplay didn't do it either.  */
! 	|| w->cursor.y + cursor_height > it.last_visible_y)
        {
  	w->cursor.vpos = -1;
  	clear_glyph_matrix (w->desired_matrix);
--- 13372,13380 ----

      if ((w->cursor.y < this_scroll_margin
  	 && CHARPOS (start) > 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 + cursor_height + this_scroll_margin > it.last_visible_y)
        {
  	w->cursor.vpos = -1;
  	clear_glyph_matrix (w->desired_matrix);

--
Kim F. Storm <storm@cua.dk> http://www.cua.dk