Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
91052:72adb6e72b67 | 91053:a0e466c4d599 |
---|---|
797 as the vertical border. If scroll bars on the left, | 797 as the vertical border. If scroll bars on the left, |
798 return the right window. */ | 798 return the right window. */ |
799 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w) | 799 if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w) |
800 || WINDOW_RIGHTMOST_P (w)) | 800 || WINDOW_RIGHTMOST_P (w)) |
801 { | 801 { |
802 if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width) | 802 if (!WINDOW_LEFTMOST_P (w) && eabs (*x - x0) < grabbable_width) |
803 { | 803 { |
804 /* Convert X and Y to window relative coordinates. | 804 /* Convert X and Y to window relative coordinates. |
805 Vertical border is at the left edge of window. */ | 805 Vertical border is at the left edge of window. */ |
806 *x = max (0, *x - x0); | 806 *x = max (0, *x - x0); |
807 *y -= top_y; | 807 *y -= top_y; |
808 return ON_VERTICAL_BORDER; | 808 return ON_VERTICAL_BORDER; |
809 } | 809 } |
810 } | 810 } |
811 else | 811 else |
812 { | 812 { |
813 if (abs (*x - x1) < grabbable_width) | 813 if (eabs (*x - x1) < grabbable_width) |
814 { | 814 { |
815 /* Convert X and Y to window relative coordinates. | 815 /* Convert X and Y to window relative coordinates. |
816 Vertical border is at the right edge of window. */ | 816 Vertical border is at the right edge of window. */ |
817 *x = min (x1, *x) - x0; | 817 *x = min (x1, *x) - x0; |
818 *y -= top_y; | 818 *y -= top_y; |
856 if (FRAME_WINDOW_P (f)) | 856 if (FRAME_WINDOW_P (f)) |
857 { | 857 { |
858 if (!w->pseudo_window_p | 858 if (!w->pseudo_window_p |
859 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) | 859 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w) |
860 && !WINDOW_RIGHTMOST_P (w) | 860 && !WINDOW_RIGHTMOST_P (w) |
861 && (abs (*x - right_x) < grabbable_width)) | 861 && (eabs (*x - right_x) < grabbable_width)) |
862 { | 862 { |
863 /* Convert X and Y to window relative coordinates. | 863 /* Convert X and Y to window relative coordinates. |
864 Vertical border is at the right edge of window. */ | 864 Vertical border is at the right edge of window. */ |
865 *x = min (right_x, *x) - left_x; | 865 *x = min (right_x, *x) - left_x; |
866 *y -= top_y; | 866 *y -= top_y; |
5495 Lisp_Object n; | 5495 Lisp_Object n; |
5496 int direction; | 5496 int direction; |
5497 { | 5497 { |
5498 int count = SPECPDL_INDEX (); | 5498 int count = SPECPDL_INDEX (); |
5499 | 5499 |
5500 xassert (abs (direction) == 1); | 5500 xassert (eabs (direction) == 1); |
5501 | 5501 |
5502 /* If selected window's buffer isn't current, make it current for | 5502 /* If selected window's buffer isn't current, make it current for |
5503 the moment. But don't screw up if window_scroll gets an error. */ | 5503 the moment. But don't screw up if window_scroll gets an error. */ |
5504 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) | 5504 if (XBUFFER (XWINDOW (selected_window)->buffer) != current_buffer) |
5505 { | 5505 { |