1 files changed, 4 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 2f8689ef13e..d80cf2d83e8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1317,6 +1317,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
       XSET (internal_last_event_frame, Lisp_Frame, selected_frame);
       Vlast_event_frame = internal_last_event_frame;
 #endif
+      /* If we report the quit char as an event,
+	 don't do so more than once.  */
+      if (!NILP (Vinhibit_quit))
+	Vquit_flag = Qnil;
 
       goto non_reread;
     }