[Emacs-diffs] /srv/bzr/emacs/trunk r99305: * keyboard.c (read_char): Return after executing from special map.

[Jan D.]

------------------------------------------------------------
revno: 99305 [merge]
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2010-01-12 09:14:45 +0100
message:
  * keyboard.c (read_char): Return after executing from special map.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-12 05:11:05 +0000
+++ b/src/ChangeLog     2010-01-12 08:12:52 +0000
@@ -1,3 +1,7 @@
+2010-01-12  Jan Djärv  <address@hidden>
+
+       * keyboard.c (read_char): Return after executing from special map.
+
 2010-01-12  Glenn Morris  <address@hidden>
 
        * emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Set it to

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-01-05 14:04:04 +0000
+++ b/src/keyboard.c    2010-01-12 08:12:52 +0000
@@ -3178,7 +3178,10 @@
       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.  */