diff options
| author | Richard M. Stallman | 2004-07-25 17:43:57 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-07-25 17:43:57 +0000 |
| commit | 6487f669677b970c9b486cfeed6b6dff412ecec3 (patch) | |
| tree | 77e322d81bf61468bcacf624ce25fde0de0e98b5 /src/window.c | |
| parent | 81159bb955c88e1315e21be0df6c6cf7f0bd3766 (diff) | |
| download | emacs-6487f669677b970c9b486cfeed6b6dff412ecec3.tar.gz emacs-6487f669677b970c9b486cfeed6b6dff412ecec3.zip | |
(coordinates_in_window): Return ON_SCROLL_BAR
instead of ON_VERTICAL_BORDER, when on scroll bar.
(Fcoordinates_in_window_p): Handle ON_SCROLL_BAR--return nil.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 8a574becd06..c3603c2039f 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -579,6 +579,8 @@ display margins, fringes, header line, and/or mode line. */) | |||
| 579 | if it is on the window's modeline, return ON_MODE_LINE; | 579 | if it is on the window's modeline, return ON_MODE_LINE; |
| 580 | if it is on the border between the window and its right sibling, | 580 | if it is on the border between the window and its right sibling, |
| 581 | return ON_VERTICAL_BORDER. | 581 | return ON_VERTICAL_BORDER. |
| 582 | if it is on a scroll bar, | ||
| 583 | return ON_SCROLL_BAR. | ||
| 582 | if it is on the window's top line, return ON_HEADER_LINE; | 584 | if it is on the window's top line, return ON_HEADER_LINE; |
| 583 | if it is in left or right fringe of the window, | 585 | if it is in left or right fringe of the window, |
| 584 | return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y | 586 | return ON_LEFT_FRINGE or ON_RIGHT_FRINGE, and convert *X and *Y |
| @@ -673,7 +675,7 @@ coordinates_in_window (w, x, y) | |||
| 673 | 675 | ||
| 674 | /* Outside any interesting column? */ | 676 | /* Outside any interesting column? */ |
| 675 | if (*x < left_x || *x > right_x) | 677 | if (*x < left_x || *x > right_x) |
| 676 | return ON_VERTICAL_BORDER; | 678 | return ON_SCROLL_BAR; |
| 677 | 679 | ||
| 678 | lmargin_width = window_box_width (w, LEFT_MARGIN_AREA); | 680 | lmargin_width = window_box_width (w, LEFT_MARGIN_AREA); |
| 679 | rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA); | 681 | rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA); |
| @@ -818,6 +820,10 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\ | |||
| 818 | case ON_RIGHT_MARGIN: | 820 | case ON_RIGHT_MARGIN: |
| 819 | return Qright_margin; | 821 | return Qright_margin; |
| 820 | 822 | ||
| 823 | case ON_SCROLL_BAR: | ||
| 824 | /* Historically we are supposed to return nil in this case. */ | ||
| 825 | return Qnil; | ||
| 826 | |||
| 821 | default: | 827 | default: |
| 822 | abort (); | 828 | abort (); |
| 823 | } | 829 | } |