(XTread_socket): Initialize variable `f' before its use.

diff --git a/src/ChangeLog b/src/ChangeLog
index fcb678d0707afbf412bdebfce50b320ee1da8151..88a8b7b4df5449edfdcce0e3624eb2d5dacff3ea 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macterm.c (XTread_socket): Initialize variable `f' before its use.
+
 2006-04-03  Kenichi Handa  <handa@m17n.org>
 
        * image.c: Include "charset.h" and "coding.h".

diff --git a/src/macterm.c b/src/macterm.c
index d30fa02e31fe3c984950ec8c1053e2977c319273..6287d1a4f93cd302248eb39619d43ba016a463cd 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10455,6 +10455,8 @@ XTread_socket (sd, expected, hold_quit)
 
            ObscureCursor ();
 
+           f = mac_focus_frame (dpyinfo);
+
            if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
                && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
              {
@@ -10500,7 +10502,7 @@ XTread_socket (sd, expected, hold_quit)
          inev.modifiers |= (extra_keyboard_modifiers
                             & (meta_modifier | alt_modifier
                                | hyper_modifier | super_modifier));
-         XSETFRAME (inev.frame_or_window, mac_focus_frame (dpyinfo));
+         XSETFRAME (inev.frame_or_window, f);
          break;
 
        case kHighLevelEvent: