Commit fc9f8d15 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

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

parent 022af124
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> 2006-04-03 Kenichi Handa <handa@m17n.org>
   
* image.c: Include "charset.h" and "coding.h". * image.c: Include "charset.h" and "coding.h".
......
...@@ -10455,6 +10455,8 @@ XTread_socket (sd, expected, hold_quit) ...@@ -10455,6 +10455,8 @@ XTread_socket (sd, expected, hold_quit)
ObscureCursor (); ObscureCursor ();
f = mac_focus_frame (dpyinfo);
if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
&& !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)) && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))
{ {
...@@ -10500,7 +10502,7 @@ XTread_socket (sd, expected, hold_quit) ...@@ -10500,7 +10502,7 @@ XTread_socket (sd, expected, hold_quit)
inev.modifiers |= (extra_keyboard_modifiers inev.modifiers |= (extra_keyboard_modifiers
& (meta_modifier | alt_modifier & (meta_modifier | alt_modifier
| hyper_modifier | super_modifier)); | hyper_modifier | super_modifier));
XSETFRAME (inev.frame_or_window, mac_focus_frame (dpyinfo)); XSETFRAME (inev.frame_or_window, f);
break; break;
case kHighLevelEvent: case kHighLevelEvent:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment