2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 65f0025f57a..080c2d26502 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-06-16  Andrew Choi  <akochoi@shaw.ca>
 
+        * macterm.c (XTread_socket): Call FrontNonFloatingWindow instead
+        of FrontWindow for cases keyDown and autoKey.
+
         * fontset.c (syms_of_fontset) [MAC_OS]: Set ASCII font of
         Vdefault_fontset to Monaco with mac-roman coding.
 
diff --git a/src/macterm.c b/src/macterm.c
index d98f24bc4fc..f3258cbb7fe 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12624,7 +12624,8 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
         bufp->modifiers = the_modifiers;
                                 
         {
-          mac_output *mwp = (mac_output *) GetWRefCon (FrontWindow ());
+          mac_output *mwp
+            = (mac_output *) GetWRefCon (FrontNonFloatingWindow ());
           XSETFRAME (bufp->frame_or_window, mwp->mFP);
         }