From fc9f8d154116dba6fd4246c86fe7db22aca3cf91 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 3 Apr 2006 06:28:48 +0000 Subject: [PATCH] (XTread_socket): Initialize variable `f' before its use. --- src/ChangeLog | 4 ++++ src/macterm.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index fcb678d0707..88a8b7b4df5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-04-03 YAMAMOTO Mitsuharu + + * macterm.c (XTread_socket): Initialize variable `f' before its use. + 2006-04-03 Kenichi Handa * image.c: Include "charset.h" and "coding.h". diff --git a/src/macterm.c b/src/macterm.c index d30fa02e31f..6287d1a4f93 100644 --- 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: -- 2.39.2