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

fc9f8d15 · YAMAMOTO Mitsuharu · 022af124 · fc9f8d15 · fc9f8d15
Commit fc9f8d15 authored Apr 03, 2006 by YAMAMOTO Mitsuharu
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/macterm.c src/macterm.c +3 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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".

--- 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: