X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fcmdloop.c;h=b54b23ca038ce7f699936e35c83aea9e95025eb7;hb=3d3d96310d2b0d20935a7ce5a21ffa6328a8361f;hp=e0153208f73bace0da903b5f3a378bb9abd5c921;hpb=76759ab036458c54499a454399e19602b8ae6ce3;p=chise%2Fxemacs-chise.git.1

diff --git a/src/cmdloop.c b/src/cmdloop.c
index e015320..b54b23c 100644
--- a/src/cmdloop.c
+++ b/src/cmdloop.c
@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include "window.h"
 
 /* Current depth in recursive edits.  */
-int command_loop_level;
+Fixnum command_loop_level;
 
 #ifndef LISP_COMMAND_LOOP
 /* Form to evaluate (if non-nil) when Emacs is started.  */
@@ -415,7 +415,7 @@ Lisp_Object
 call_command_loop (Lisp_Object catch_errors)
 {
   /* This function can GC */
-  reset_this_command_keys (Vselected_console, Qnil); /* #### bleagh */
+  reset_this_command_keys (Vselected_console, 0); /* #### bleagh */
 
  loop:
   for (;;)
@@ -549,9 +549,13 @@ Don't call this unless you know what you're doing.
 	  }
       }
 
+#if 0 /* What's wrong with going through ordinary procedure of quit?
+         quitting here leaves overriding-terminal-local-map
+         when you type C-u C-u C-g. */
       /* If ^G was typed before we got here (that is, before emacs was
 	 idle and waiting for input) then we treat that as an interrupt. */
       QUIT;
+#endif
 
       /* If minibuffer on and echo area in use, wait 2 sec and redraw
 	 minibuffer.  Treat a ^G here as a command, not an interrupt.