From 31ea78fd30fb94440da323ae149571e2e7de7778 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@redhat.com>
Date: Thu, 24 Jun 1993 01:34:33 +0000
Subject: [PATCH] * xterm.c (XTread_socket): Remove #if 0''s around code which
 tests 	for dropped connection (i.e. sigio but no events).

---
 src/xterm.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index ca19976252..bc14b6ff00 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3268,7 +3268,6 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 	}
     }
 
-#if 0
 #ifdef HAVE_SELECT
   if (expected && ! event_found)
     {
@@ -3285,7 +3284,6 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 	kill (getpid (), SIGHUP);
     }
 #endif /* ! defined (HAVE_SELECT) */
-#endif /* ! 0 */
 
 #ifndef HAVE_X11
   if (updating_frame == 0)
@@ -4083,12 +4081,16 @@ x_calc_absolute_position (f)
 {
 #ifdef HAVE_X11
   if (f->display.x->left_pos < 0)
-    f->display.x->left_pos
-      = x_screen_width - PIXEL_WIDTH (f) + f->display.x->left_pos;
+    f->display.x->left_pos = (x_screen_width 
+			      - 2 * f->display.x->border_width
+			      - PIXEL_WIDTH (f)
+			      + f->display.x->left_pos);
 
   if (f->display.x->top_pos < 0)
-    f->display.x->top_pos
-      = x_screen_height - PIXEL_HEIGHT (f) + f->display.x->top_pos;
+    f->display.x->top_pos = (x_screen_height
+			     - 2 * f->display.x->border_width
+			     - PIXEL_HEIGHT (f)
+			     + f->display.x->top_pos);
 #else /* ! defined (HAVE_X11) */
   WINDOWINFO_TYPE parentinfo;
 
-- 
2.20.1