*** window.c.~1.634.~	2008-11-18 18:56:23.703125000 +0100
--- window.c	2008-11-19 16:04:02.078125000 +0100
***************
*** 774,780 ****
  	}
        else
  	{
! 	  if (eabs (*x - x1) < grabbable_width)
  	    {
  	      /* Convert X and Y to window relative coordinates.
  		 Vertical border is at the right edge of window.  */
--- 774,781 ----
  	}
        else
  	{
! 	  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.  */