3 files changed, 60 insertions, 71 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 52fe8baa92e..2c72e97b7f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2011-10-15  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (coordinates_in_window): Rewrite and delabelize
+        vertical border check.  (Bug#5357) (Bug#9618)
+
+2011-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (frame_highlight, frame_unhighlight): Ignore unexplained
+        errors in XSetWindowBorder (bug#9310).
+
 2011-10-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * editfns.c (Fset_time_zone_rule): Replace free with xfree to
@@ -71,8 +81,8 @@
 
 2011-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * buffer.c (syms_of_buffer) <enable-multibyte-characters>: Don't
-        advertise functionality which we discourage or doesn't work.
+        * buffer.c (syms_of_buffer) <enable-multibyte-characters>:
+        Don't advertise functionality which we discourage or doesn't work.
 
 2011-10-07  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -338,8 +348,7 @@
 2011-09-17  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (reseat_at_next_visible_line_start): Keep information
-        about the current paragraph and restore it after the call to
-        reseat.
+        about the current paragraph and restore it after the call to reseat.
 
         * bidi.c (MAX_PARAGRAPH_SEARCH): New macro.
         (bidi_find_paragraph_start): Search back for paragraph beginning
@@ -559,7 +568,7 @@
         * doprnt.c (doprnt): Support printing ptrdiff_t and intmax_t values.
         (esprintf, exprintf, evxprintf): New functions.
         * keyboard.c (command_loop_level): Now EMACS_INT, not int.
-        (cmd_error): kbd macro iterations count is now EMACS_INT, not int.
+        (cmd_error): Kbd macro iterations count is now EMACS_INT, not int.
         (modify_event_symbol): Do not assume that the length of
         name_alist_or_stem is safe to alloca and fits in int.
         (Fexecute_extended_command): Likewise for function name and binding.
@@ -1303,8 +1312,7 @@
 
 2011-08-18  Andreas Schwab  <schwab@linux-m68k.org>
 
-        * process.c (Fnetwork_interface_list): Correctly determine buffer
-        size.
+        * process.c (Fnetwork_interface_list): Correctly determine buffer size.
 
 2011-08-17  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -1349,15 +1357,10 @@
 
 2011-08-15  Eli Zaretskii  <eliz@gnu.org>
 
-        * biditype.h: File removed.
-
-        * bidimirror.h: File removed.
-
-        * deps.mk (bidi.o): Remove biditype.h and
-        bidimirror.h.
-
-        * makefile.w32-in ($(BLD)/bidi.$(O)): Remove biditype.h and
-        bidimirror.h.
+        * bidimirror.h:
+        * biditype.h: Remove file.
+        * makefile.w32-in ($(BLD)/bidi.$(O)):
+        * deps.mk (bidi.o): Remove biditype.h and bidimirror.h.
 
         * dispextern.h: Fix a typo in the comment to bidi_type_t.
 
@@ -1532,8 +1535,7 @@
 
 2011-08-04  Andreas Schwab  <schwab@linux-m68k.org>
 
-        * regex.c (re_iswctype): Remove some redundant boolean
-        conversions.
+        * regex.c (re_iswctype): Remove some redundant boolean conversions.
 
 2011-08-04  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -2070,8 +2072,7 @@
 2011-07-15  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (move_it_in_display_line_to): Fix vertical motion with
-        bidi redisplay when a line includes both an image and is
-        truncated.
+        bidi redisplay when a line includes both an image and is truncated.
 
 2011-07-14  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/window.c b/src/window.c
index 94b9f8a451f..7f4714ba17e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -921,22 +921,45 @@ static enum window_part
 coordinates_in_window (register struct window *w, int x, int y)
 {
   struct frame *f = XFRAME (WINDOW_FRAME (w));
-  int left_x, right_x;
   enum window_part part;
   int ux = FRAME_COLUMN_WIDTH (f);
-  int x0 = WINDOW_LEFT_EDGE_X (w);
-  int x1 = WINDOW_RIGHT_EDGE_X (w);
+  int left_x = WINDOW_LEFT_EDGE_X (w);
+  int right_x = WINDOW_RIGHT_EDGE_X (w);
+  int top_y = WINDOW_TOP_EDGE_Y (w);
+  int bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
   /* The width of the area where the vertical line can be dragged.
      (Between mode lines for instance.  */
   int grabbable_width = ux;
   int lmargin_width, rmargin_width, text_left, text_right;
-  int top_y = WINDOW_TOP_EDGE_Y (w);
-  int bottom_y = WINDOW_BOTTOM_EDGE_Y (w);
 
-  /* Outside any interesting row?  */
-  if (y < top_y || y >= bottom_y)
+  /* Outside any interesting row or column?  */
+  if (y < top_y || y >= bottom_y || x < left_x || x >= right_x)
     return ON_NOTHING;
 
+  /* On the mode line or header line?   */
+  if ((WINDOW_WANTS_MODELINE_P (w)
+       && y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w)
+       && (part = ON_MODE_LINE))
+      || (WINDOW_WANTS_HEADER_LINE_P (w)
+          && y < top_y + CURRENT_HEADER_LINE_HEIGHT (w)
+          && (part = ON_HEADER_LINE)))
+    {
+      /* If it's under/over the scroll bar portion of the mode/header
+         line, say it's on the vertical line.  That's to be able to
+         resize windows horizontally in case we're using toolkit scroll
+         bars.  Note: If scrollbars are on the left, the window that
+         must be eventually resized is that on the left of WINDOW.  */
+      if ((WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
+           && !WINDOW_LEFTMOST_P (w)
+           && eabs (x - left_x) < grabbable_width)
+          || (!WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
+              && !WINDOW_RIGHTMOST_P (w)
+              && eabs (x - right_x) < grabbable_width))
+        return ON_VERTICAL_BORDER;
+      else
+        return part;
+    }
+
   /* In what's below, we subtract 1 when computing right_x because we
      want the rightmost pixel, which is given by left_pixel+width-1.  */
   if (w->pseudo_window_p)
@@ -950,50 +973,6 @@ coordinates_in_window (register struct window *w, int x, int y)
       right_x = WINDOW_BOX_RIGHT_EDGE_X (w) - 1;
     }
 
-  /* On the mode line or header line?  If it's near the start of
-     the mode or header line of window that's has a horizontal
-     sibling, say it's on the vertical line.  That's to be able
-     to resize windows horizontally in case we're using toolkit
-     scroll bars.  */
-
-  if (WINDOW_WANTS_MODELINE_P (w)
-      && y >= bottom_y - CURRENT_MODE_LINE_HEIGHT (w))
-    {
-      part = ON_MODE_LINE;
-
-    header_vertical_border_check:
-      /* We're somewhere on the mode line.  We consider the place
-         between mode lines of horizontally adjacent mode lines
-         as the vertical border.  If scroll bars on the left,
-         return the right window.  */
-      if ((WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)
-           || WINDOW_RIGHTMOST_P (w))
-          && !WINDOW_LEFTMOST_P (w)
-          && eabs (x - x0) < grabbable_width)
-        return ON_VERTICAL_BORDER;
-
-      /* 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)  */
-      else if ((WINDOW_RIGHTMOST_P (w) || x < x1)
-               && eabs (x - x1) < grabbable_width)
-        return ON_VERTICAL_BORDER;
-
-      if (x < x0 || x >= x1)
-        return ON_NOTHING;
-
-      return part;
-    }
-
-  if (WINDOW_WANTS_HEADER_LINE_P (w)
-      && y < top_y + CURRENT_HEADER_LINE_HEIGHT (w))
-    {
-      part = ON_HEADER_LINE;
-      goto header_vertical_border_check;
-    }
-
-  if (x < x0 || x >= x1) return ON_NOTHING;
-
   /* Outside any interesting column?  */
   if (x < left_x || x > right_x)
     return ON_SCROLL_BAR;
diff --git a/src/xterm.c b/src/xterm.c
index 1357afa0c15..128a274ff10 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3364,8 +3364,14 @@ frame_highlight (struct frame *f)
      and border pixel are window attributes which are "private to the
      client", so we can always change it to whatever we want.  */
   BLOCK_INPUT;
+  /* I recently started to get errors in this XSetWindowBorder, depending on
+     the window-manager in use, tho something more is at play since I've been
+     using that same window-manager binary for ever.  Let's not crash just
+     because of this (bug#9310).  */
+  x_catch_errors (FRAME_X_DISPLAY (f));
   XSetWindowBorder (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                     f->output_data.x->border_pixel);
+  x_uncatch_errors ();
   UNBLOCK_INPUT;
   x_update_cursor (f, 1);
   x_set_frame_alpha (f);
@@ -3379,8 +3385,11 @@ frame_unhighlight (struct frame *f)
      and border pixel are window attributes which are "private to the
      client", so we can always change it to whatever we want.  */
   BLOCK_INPUT;
+  /* Same as above for XSetWindowBorder (bug#9310).  */
+  x_catch_errors (FRAME_X_DISPLAY (f));
   XSetWindowBorderPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                           f->output_data.x->border_tile);
+  x_uncatch_errors ();
   UNBLOCK_INPUT;
   x_update_cursor (f, 1);
   x_set_frame_alpha (f);