diff options
| author | Martin Rudalics | 2008-11-20 10:13:40 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2008-11-20 10:13:40 +0000 |
| commit | f6ef1e6545616f5419b7c3104ead13514851986e (patch) | |
| tree | f3ed344bbcdc99b95897978800389fa320a86891 /src | |
| parent | a54fdddbe5d8fd6e62e4f521abc188dac3a10a8a (diff) | |
| download | emacs-f6ef1e6545616f5419b7c3104ead13514851986e.tar.gz emacs-f6ef1e6545616f5419b7c3104ead13514851986e.zip | |
(coordinates_in_window): Don't return
ON_VERTICAL_BORDER for the rightmost position of a mode/header
line when the window is not the rightmost one. (Bug#1372)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/window.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 52d70fdaa90..fe4b1abaddf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-11-20 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.c (coordinates_in_window): Don't return | ||
| 4 | ON_VERTICAL_BORDER for the rightmost position of a mode/header | ||
| 5 | line when the window is not the rightmost one. (Bug#1372) | ||
| 6 | |||
| 1 | 2008-11-16 Ben North <ben@redfrontdoor.org> (tiny change) | 7 | 2008-11-16 Ben North <ben@redfrontdoor.org> (tiny change) |
| 2 | 8 | ||
| 3 | * buffer.c (syms_of_buffer): Fix doc-string of cursor-type. | 9 | * buffer.c (syms_of_buffer): Fix doc-string of cursor-type. |
diff --git a/src/window.c b/src/window.c index d770822c28d..c74b163cb9f 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -774,7 +774,11 @@ coordinates_in_window (w, x, y) | |||
| 774 | } | 774 | } |
| 775 | else | 775 | else |
| 776 | { | 776 | { |
| 777 | if (eabs (*x - x1) < grabbable_width) | 777 | /* Make sure we're not at the rightmost position of a |
| 778 | mode-/header-line and there's yet another window on | ||
| 779 | the right. (Bug#1372) */ | ||
| 780 | if ((WINDOW_RIGHTMOST_P (w) || *x < x1) | ||
| 781 | && eabs (*x - x1) < grabbable_width) | ||
| 778 | { | 782 | { |
| 779 | /* Convert X and Y to window relative coordinates. | 783 | /* Convert X and Y to window relative coordinates. |
| 780 | Vertical border is at the right edge of window. */ | 784 | Vertical border is at the right edge of window. */ |