Commit 6cbff1cb authored by Richard M. Stallman's avatar Richard M. Stallman

(make_lispy_movement): Conditionalize on MULTI_FRAME.

(kbd_buffer_get_event): Call make_lispy_movement only if MULTI_FRAME.
parent 7ffb2841
...@@ -2088,13 +2088,13 @@ kbd_buffer_get_event () ...@@ -2088,13 +2088,13 @@ kbd_buffer_get_event ()
obj = make_lispy_switch_frame (frame); obj = make_lispy_switch_frame (frame);
internal_last_event_frame = frame; internal_last_event_frame = frame;
} }
#endif
/* If we didn't decide to make a switch-frame event, go ahead and /* If we didn't decide to make a switch-frame event, go ahead and
return a mouse-motion event. */ return a mouse-motion event. */
if (NILP (obj)) if (NILP (obj))
obj = make_lispy_movement (f, bar_window, part, x, y, time); obj = make_lispy_movement (f, bar_window, part, x, y, time);
} #endif
}
else else
/* We were promised by the above while loop that there was /* We were promised by the above while loop that there was
something for us to read! */ something for us to read! */
...@@ -2698,6 +2698,8 @@ make_lispy_event (event) ...@@ -2698,6 +2698,8 @@ make_lispy_event (event)
} }
} }
#ifdef MULTI_FRAME
static Lisp_Object static Lisp_Object
make_lispy_movement (frame, bar_window, part, x, y, time) make_lispy_movement (frame, bar_window, part, x, y, time)
FRAME_PTR frame; FRAME_PTR frame;
...@@ -2777,6 +2779,8 @@ make_lispy_movement (frame, bar_window, part, x, y, time) ...@@ -2777,6 +2779,8 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
} }
} }
#endif /* MULTI_FRAME */
/* Construct a switch frame event. */ /* Construct a switch frame event. */
static Lisp_Object static Lisp_Object
make_lispy_switch_frame (frame) make_lispy_switch_frame (frame)
......
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