Mercurial > emacs

comparison src/window.c @ 90072:cb67264d6096

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Sun, 16 Jan 2005 03:40:12 +0000
parents 95879cc1ed20 132e8f3a36a1
children 6d92d69fae33
comparison
equal deleted inserted replaced
90071:f6b4d0ebf147 90072:cb67264d6096
4686 if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin) 4686 if (IT_CHARPOS (it) == PT && it.current_y >= this_scroll_margin)
4687 /* We found PT at a legitimate height. Leave it alone. */ 4687 /* We found PT at a legitimate height. Leave it alone. */
4688 ; 4688 ;
4689 else if (preserve_y >= 0) 4689 else if (preserve_y >= 0)
4690 { 4690 {
4691 /* If we have a header line, take account of it. */ 4691 /* If we have a header line, take account of it.
4692 This is necessary because we set it.current_y to 0, above. */
4692 if (WINDOW_WANTS_HEADER_LINE_P (w)) 4693 if (WINDOW_WANTS_HEADER_LINE_P (w))
4693 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w); 4694 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
4694 4695
4695 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); 4696 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
4696 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); 4697 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
4726 ; 4727 ;
4727 else if (preserve_y >= 0) 4728 else if (preserve_y >= 0)
4728 { 4729 {
4729 SET_TEXT_POS_FROM_MARKER (start, w->start); 4730 SET_TEXT_POS_FROM_MARKER (start, w->start);
4730 start_display (&it, w, start); 4731 start_display (&it, w, start);
4732 #if 0 /* It's wrong to subtract this here
4733 because we called start_display again
4734 and did not alter it.current_y this time. */
4735
4731 /* If we have a header line, take account of it. */ 4736 /* If we have a header line, take account of it. */
4732 if (WINDOW_WANTS_HEADER_LINE_P (w)) 4737 if (WINDOW_WANTS_HEADER_LINE_P (w))
4733 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w); 4738 preserve_y -= CURRENT_HEADER_LINE_HEIGHT (w);
4739 #endif
4734 4740
4735 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y); 4741 move_it_to (&it, -1, -1, preserve_y, -1, MOVE_TO_Y);
4736 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); 4742 SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
4737 } 4743 }
4738 else 4744 else