Mercurial > emacs
diff src/window.c @ 91053:a0e466c4d599
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 887-889)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 116-121)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-268
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 15 Oct 2007 05:03:21 +0000 |
parents | bdb3fe0ba9fa 96a92ff6e0de |
children | 1251cabc40b7 |
line wrap: on
line diff
--- a/src/window.c Mon Oct 15 04:54:31 2007 +0000 +++ b/src/window.c Mon Oct 15 05:03:21 2007 +0000 @@ -799,7 +799,7 @@ if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w) || WINDOW_RIGHTMOST_P (w)) { - if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width) + if (!WINDOW_LEFTMOST_P (w) && eabs (*x - x0) < grabbable_width) { /* Convert X and Y to window relative coordinates. Vertical border is at the left edge of window. */ @@ -810,7 +810,7 @@ } else { - if (abs (*x - x1) < grabbable_width) + if (eabs (*x - x1) < grabbable_width) { /* Convert X and Y to window relative coordinates. Vertical border is at the right edge of window. */ @@ -858,7 +858,7 @@ if (!w->pseudo_window_p && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) && !WINDOW_RIGHTMOST_P (w) - && (abs (*x - right_x) < grabbable_width)) + && (eabs (*x - right_x) < grabbable_width)) { /* Convert X and Y to window relative coordinates. Vertical border is at the right edge of window. */ @@ -5497,7 +5497,7 @@ { int count = SPECPDL_INDEX (); - xassert (abs (direction) == 1); + xassert (eabs (direction) == 1); /* If selected window's buffer isn't current, make it current for the moment. But don't screw up if window_scroll gets an error. */