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

[Richard M . Stallman]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.490 emacs/src/window.c:1.491
*** emacs/src/window.c:1.490    Fri Dec 31 15:07:48 2004
--- emacs/src/window.c  Tue Jan  4 03:00:21 2005
***************
*** 4688,4694 ****
        ;
        else if (preserve_y >= 0)
        {
!         /* If we have a header line, take account of it.  */
          if (WINDOW_WANTS_HEADER_LINE_P (w))
            preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
  
--- 4688,4695 ----
        ;
        else if (preserve_y >= 0)
        {
!         /* If we have a header line, take account of it.
!            This is necessary because we set it.current_y to 0, above.  */
          if (WINDOW_WANTS_HEADER_LINE_P (w))
            preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
  
***************
*** 4728,4736 ****
--- 4729,4742 ----
        {
          SET_TEXT_POS_FROM_MARKER (start, w->start);
          start_display (&it, w, start);
+ #if 0  /* It's wrong to subtract this here
+         because we called start_display again
+         and did not alter it.current_y this time.  */
+ 
          /* If we have a header line, take account of it.  */
          if (WINDOW_WANTS_HEADER_LINE_P (w))
            preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
+ #endif
  
          move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
          SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));