From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 17 Jun 2005 14:06:22 +0000 (+0000)
Subject: (read_char): Call restore_getcjmp after jump occurs.
X-Git-Tag: emacs-pretest-22.0.90~8838
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dfbfad25bf75a6dea0b831f6e36397c6892e04b0;p=emacs.git

(read_char): Call restore_getcjmp after jump occurs.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index b213d187aac..524f0efabbd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2616,6 +2616,9 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 
   if (_setjmp (local_getcjmp))
     {
+      /* We must have saved the outer value of getcjmp here,
+	 so restore it now.  */
+      restore_getcjmp (save_jump);
       XSETINT (c, quit_char);
       internal_last_event_frame = selected_frame;
       Vlast_event_frame = internal_last_event_frame;