From 60abb2870ba8d0314cde544d62dbb24aa53b8074 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 12 Jan 2010 09:12:52 +0100 Subject: [PATCH] keyboard.c (read_char): Return after executing from special map. --- src/ChangeLog | 4 ++++ src/keyboard.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d14ef05a1ff..f52cf8fee63 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-01-12 Jan Djärv + + * keyboard.c (read_char): Return after executing from special map. + 2010-01-12 Glenn Morris * emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Set it to diff --git a/src/keyboard.c b/src/keyboard.c index 13d13cd3276..8bd8cf30468 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3178,7 +3178,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time) unbind_to (count, Qnil); #endif - goto retry; + /* The command may have changed the keymaps. Pretend there is input + in another keyboard and return. This will recalculate keymaps. */ + c = make_number (-2); + goto exit; } /* Handle things that only apply to characters. */ -- 2.39.2