* keyboard.c (kbd_buffer_get_event): When performing the

	FRAME_FOCUS_FRAME redirection, don't modify the frame field of
	the event; that fatally corrupts mouse click events.  Instead,
	just perform the redirection on the value assigned to
	Vlast_event_frame.

	* keyboard.c (input_available_signal): Declare this to return
	SIGTYPE.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 5b04990b055..5a2e635f843 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1587,13 +1587,10 @@ kbd_buffer_get_event ()
     {
       if (kbd_fetch_ptr == kbd_buffer + KBD_BUFFER_SIZE)
         kbd_fetch_ptr = kbd_buffer;
-      /* Do the redirection specified by the focus_frame
-         member now, before we return this event.  */
-      kbd_fetch_ptr->frame
-        = XFRAME (FRAME_FOCUS_FRAME (kbd_fetch_ptr->frame));
 
 #ifdef MULTI_FRAME
-      XSET (Vlast_event_frame, Lisp_Frame, kbd_fetch_ptr->frame);
+      XSET (Vlast_event_frame, Lisp_Frame,
+            XFRAME (FRAME_FOCUS_FRAME (kbd_fetch_ptr->frame)));
 #endif
 
       last_event_timestamp = kbd_fetch_ptr->timestamp;
@@ -2212,6 +2209,7 @@ read_avail_input (expected)
 #ifdef SIGIO   /* for entire page */
 /* Note SIGIO has been undef'd if FIONREAD is missing.  */
 
+SIGTYPE
 input_available_signal (signo)
      int signo;
 {