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 @@
+2008-11-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (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)
+
 2008-11-16  Ben North  <ben@redfrontdoor.org>  (tiny change)
 
         * 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)
         }
       else
         {
-          if (eabs (*x - x1) < grabbable_width)
+          /* Make sure we're not at the rightmost position of a
+             mode-/header-line and there's yet another window on
+             the right.  (Bug#1372)  */
+          if ((WINDOW_RIGHTMOST_P (w) || *x < x1)
+              && eabs (*x - x1) < grabbable_width)
             {
               /* Convert X and Y to window relative coordinates.
                  Vertical border is at the right edge of window.  */