From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 16 Apr 1996 21:54:34 +0000 (+0000)
Subject: (w32_read_socket): Initialize frame_or_window field.
X-Git-Tag: emacs-19.34~826
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a92989c399a094529de8713c451f654b21265666;p=emacs.git

(w32_read_socket): Initialize frame_or_window field.
(x_make_frame_visible): Don't call SetForegroundWindow after x_set_offset.
(win32_initialize): Call AttachThreadInput at the end.
---

diff --git a/src/w32term.c b/src/w32term.c
index a73cd1905f8..2daa30d96cd 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2374,6 +2374,7 @@ w32_read_socket (sd, bufp, numchars, waitp, expected)
 		  
 		  convert_to_key_event (&msg, keyp);
 		  add = key_event (keyp, bufp);
+		  XSETFRAME (bufp->frame_or_window, f);
 		  if (add == -1)
 		    {
 		      /* The key pressed generated two characters, most likely
@@ -3334,7 +3335,6 @@ x_make_frame_visible (f)
 	{
 	  x_set_offset (f, f->output_data.win32->left_pos, 
 			f->output_data.win32->top_pos, 0);
-	  SetForegroundWindow (FRAME_WIN32_WINDOW (f));
 	}
 
       f->output_data.win32->asked_for_visible = 1;
@@ -3744,7 +3744,7 @@ win32_initialize ()
     GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE);
   }
   
-  /*  AttachThreadInput (dwWinThreadId, dwMainThreadId, TRUE); */
+  AttachThreadInput (dwMainThreadId, dwWinThreadId, TRUE);
 
 }