[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/window.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/window.c |
Date: |
Wed, 17 Apr 2002 06:36:09 -0400 |
Index: emacs/src/window.c
diff -c emacs/src/window.c:1.411 emacs/src/window.c:1.412
*** emacs/src/window.c:1.411 Fri Apr 12 05:36:21 2002
--- emacs/src/window.c Wed Apr 17 06:36:08 2002
***************
*** 534,539 ****
--- 534,540 ----
/* The width of the area where the vertical line can be dragged.
(Between mode lines for instance. */
int grabbable_width = ux;
+ int lmargin_width = 0, rmargin_width = 0;
if (*x < x0 || *x >= x1)
return ON_NOTHING;
***************
*** 628,636 ****
}
else
{
! if (*x <= window_box_right (w, LEFT_MARGIN_AREA))
part = ON_LEFT_MARGIN;
! else if (*x >= window_box_left (w, RIGHT_MARGIN_AREA))
part = ON_RIGHT_MARGIN;
else
{
--- 629,642 ----
}
else
{
! lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
! rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
! /* You can never be on a margin area if its width is zero. */
! if (lmargin_width
! && *x <= window_box_right (w, LEFT_MARGIN_AREA))
part = ON_LEFT_MARGIN;
! else if (rmargin_width
! && *x >= window_box_left (w, RIGHT_MARGIN_AREA))
part = ON_RIGHT_MARGIN;
else
{
***************
*** 665,673 ****
}
else
{
! if (*x <= window_box_right (w, LEFT_MARGIN_AREA))
part = ON_LEFT_MARGIN;
! else if (*x >= window_box_left (w, RIGHT_MARGIN_AREA))
part = ON_RIGHT_MARGIN;
else
{
--- 671,685 ----
}
else
{
! lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
! rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
! /* You can never be on a margin area if its width is zero.
! This is especially important for character terminals. */
! if (lmargin_width
! && *x <= window_box_right (w, LEFT_MARGIN_AREA))
part = ON_LEFT_MARGIN;
! else if (rmargin_width
! && *x >= window_box_left (w, RIGHT_MARGIN_AREA))
part = ON_RIGHT_MARGIN;
else
{