[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/window.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/window.c |
Date: |
Sun, 23 Jan 2005 08:13:04 -0500 |
Index: emacs/src/window.c
diff -c emacs/src/window.c:1.493 emacs/src/window.c:1.494
*** emacs/src/window.c:1.493 Sun Jan 23 00:50:24 2005
--- emacs/src/window.c Sun Jan 23 13:13:03 2005
***************
*** 333,343 ****
POS defaults to point in WINDOW; WINDOW defaults to the selected window.
If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
! return value is a list (X Y FULLY [RTOP RBOT]) where X and Y are the pixel
! coordinates relative to the top left corner of the window, and FULLY is t if
the
! character after POS is fully visible and nil otherwise. If FULLY is nil,
! RTOP and RBOT are the number of pixels invisible at the top and bottom row
! of the window. */)
(pos, window, partially)
Lisp_Object pos, window, partially;
{
--- 333,342 ----
POS defaults to point in WINDOW; WINDOW defaults to the selected window.
If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
! return value is a list (X Y PARTIAL) where X and Y are the pixel coordinates
! relative to the top left corner of the window. PARTIAL is nil if the character
! after POS is fully visible; otherwise it is a cons (RTOP . RBOT) where RTOP
! and RBOT are the number of pixels invisible at the top and bottom of the row.
*/)
(pos, window, partially)
Lisp_Object pos, window, partially;
{
***************
*** 376,387 ****
if (!NILP (in_window) && !NILP (partially))
in_window = Fcons (make_number (x),
Fcons (make_number (y),
! Fcons (fully_p ? Qt : Qnil,
! (fully_p
! ? Qnil
! : Fcons (make_number (rtop),
! Fcons (make_number (rbot),
! Qnil))))));
return in_window;
}
--- 375,384 ----
if (!NILP (in_window) && !NILP (partially))
in_window = Fcons (make_number (x),
Fcons (make_number (y),
! Fcons ((fully_p ? Qnil
! : Fcons (make_number (rtop),
! make_number (rbot))),
! Qnil)));
return in_window;
}
***************
*** 4578,4584 ****
}
else if (auto_window_vscroll_p)
{
! if (NILP (XCAR (XCDR (XCDR (tem)))))
{
int px;
int dy = WINDOW_FRAME_LINE_HEIGHT (w);
--- 4575,4581 ----
}
else if (auto_window_vscroll_p)
{
! if (tem = XCAR (XCDR (XCDR (tem))), CONSP (tem))
{
int px;
int dy = WINDOW_FRAME_LINE_HEIGHT (w);
***************
*** 4586,4598 ****
dy = window_box_height (w) - next_screen_context_lines * dy;
dy *= n;
! if (n < 0 && (px = XINT (Fnth (make_number (3), tem))) > 0)
{
px = max (0, -w->vscroll - min (px, -dy));
Fset_window_vscroll (window, make_number (px), Qt);
return;
}
! if (n > 0 && (px = XINT (Fnth (make_number (4), tem))) > 0)
{
px = max (0, -w->vscroll + min (px, dy));
Fset_window_vscroll (window, make_number (px), Qt);
--- 4583,4595 ----
dy = window_box_height (w) - next_screen_context_lines * dy;
dy *= n;
! if (n < 0 && (px = XINT (XCAR (tem))) > 0)
{
px = max (0, -w->vscroll - min (px, -dy));
Fset_window_vscroll (window, make_number (px), Qt);
return;
}
! if (n > 0 && (px = XINT (XCDR (tem))) > 0)
{
px = max (0, -w->vscroll + min (px, dy));
Fset_window_vscroll (window, make_number (px), Qt);