projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(put_char_table): Modify for `charset_code_point'.
[chise/xemacs-chise.git]
/
src
/
cmdloop.c
diff --git
a/src/cmdloop.c
b/src/cmdloop.c
index
4d0cab8
..
024ed8a
100644
(file)
--- 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. */
#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. */
#ifndef LISP_COMMAND_LOOP
/* Form to evaluate (if non-nil) when Emacs is started. */
@@
-121,6
+121,10
@@
You should almost certainly not be using this.
stderr_out ("*** Backtrace\n");
Fbacktrace (Qexternal_debugging_output, Qt);
stderr_out ("*** Killing XEmacs\n");
stderr_out ("*** Backtrace\n");
Fbacktrace (Qexternal_debugging_output, Qt);
stderr_out ("*** Killing XEmacs\n");
+#ifdef HAVE_MS_WINDOWS
+ Fmswindows_message_box (build_string ("Initialization error"),
+ Qnil, Qnil);
+#endif
return Fkill_emacs (make_int (-1));
}
return Fkill_emacs (make_int (-1));
}
@@
-518,8
+522,8
@@
Don't call this unless you know what you're doing.
like the real thing. This is slightly bogus, but it's in here for
compatibility with Emacs 18. It's not even clear what the "right
thing" is. */
like the real thing. This is slightly bogus, but it's in here for
compatibility with Emacs 18. It's not even clear what the "right
thing" is. */
- if (!(((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
- && XINT (Flength (Vexecuting_macro)) == 1)))
+ if (!((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
+ && XINT (Flength (Vexecuting_macro)) == 1))
Vlast_command = Qt;
#ifndef LISP_COMMAND_LOOP
Vlast_command = Qt;
#ifndef LISP_COMMAND_LOOP
@@
-533,7
+537,7
@@
Don't call this unless you know what you're doing.
focus is selected. */
if (focus_follows_mouse)
investigate_frame_change ();
focus is selected. */
if (focus_follows_mouse)
investigate_frame_change ();
-
+
/* Make sure the current window's buffer is selected. */
{
Lisp_Object selected_window = Fselected_window (Qnil);
/* Make sure the current window's buffer is selected. */
{
Lisp_Object selected_window = Fselected_window (Qnil);
@@
-545,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;
/* 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.
/* If minibuffer on and echo area in use, wait 2 sec and redraw
minibuffer. Treat a ^G here as a command, not an interrupt.