Mercurial > emacs

changeset 15035:a538ad05bce1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Richard M. Stallman <rms@gnu.org>
date Tue, 16 Apr 1996 21:54:34 +0000
parents fb947ec168a8
children e782b987fbdb
files src/w32term.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32term.c	Tue Apr 16 21:49:18 1996 +0000
+++ b/src/w32term.c	Tue Apr 16 21:54:34 1996 +0000
@@ -2374,6 +2374,7 @@
 		  
 		  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_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 @@
     GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE);
   }
   
-  /*  AttachThreadInput (dwWinThreadId, dwMainThreadId, TRUE); */
+  AttachThreadInput (dwMainThreadId, dwWinThreadId, TRUE);
 
 }