aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-04-11 21:34:38 +0000
committerRichard M. Stallman1994-04-11 21:34:38 +0000
commit6cbff1cb500ac8b2bf80536cf6f0c2329bb82abf (patch)
treef1b2943e83a36b3e052a3157d7f18bdc93cfa314
parent7ffb2841219e1d95f554501cfcbb40010530d19a (diff)
downloademacs-6cbff1cb500ac8b2bf80536cf6f0c2329bb82abf.tar.gz
emacs-6cbff1cb500ac8b2bf80536cf6f0c2329bb82abf.zip
(make_lispy_movement): Conditionalize on MULTI_FRAME.
(kbd_buffer_get_event): Call make_lispy_movement only if MULTI_FRAME.
-rw-r--r--src/keyboard.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index dcda52ba441..c9eb36c03d3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2088,13 +2088,13 @@ kbd_buffer_get_event ()
2088 obj = make_lispy_switch_frame (frame); 2088 obj = make_lispy_switch_frame (frame);
2089 internal_last_event_frame = frame; 2089 internal_last_event_frame = frame;
2090 } 2090 }
2091#endif
2092 2091
2093 /* If we didn't decide to make a switch-frame event, go ahead and 2092 /* If we didn't decide to make a switch-frame event, go ahead and
2094 return a mouse-motion event. */ 2093 return a mouse-motion event. */
2095 if (NILP (obj)) 2094 if (NILP (obj))
2096 obj = make_lispy_movement (f, bar_window, part, x, y, time); 2095 obj = make_lispy_movement (f, bar_window, part, x, y, time);
2097 } 2096#endif
2097 }
2098 else 2098 else
2099 /* We were promised by the above while loop that there was 2099 /* We were promised by the above while loop that there was
2100 something for us to read! */ 2100 something for us to read! */
@@ -2698,6 +2698,8 @@ make_lispy_event (event)
2698 } 2698 }
2699} 2699}
2700 2700
2701#ifdef MULTI_FRAME
2702
2701static Lisp_Object 2703static Lisp_Object
2702make_lispy_movement (frame, bar_window, part, x, y, time) 2704make_lispy_movement (frame, bar_window, part, x, y, time)
2703 FRAME_PTR frame; 2705 FRAME_PTR frame;
@@ -2777,6 +2779,8 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
2777 } 2779 }
2778} 2780}
2779 2781
2782#endif /* MULTI_FRAME */
2783
2780/* Construct a switch frame event. */ 2784/* Construct a switch frame event. */
2781static Lisp_Object 2785static Lisp_Object
2782make_lispy_switch_frame (frame) 2786make_lispy_switch_frame (frame)