projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(char_byte_table_equal): Fill braces to avoid ambiguous `else'.
[chise/xemacs-chise.git-]
/
src
/
event-stream.c
diff --git
a/src/event-stream.c
b/src/event-stream.c
index
2b955fe
..
f008935
100644
(file)
--- a/
src/event-stream.c
+++ b/
src/event-stream.c
@@
-413,7
+413,7
@@
finalize_command_builder (void *header, int for_disksave)
DEFINE_LRECORD_IMPLEMENTATION ("command-builder", command_builder,
mark_command_builder, internal_object_printer,
DEFINE_LRECORD_IMPLEMENTATION ("command-builder", command_builder,
mark_command_builder, internal_object_printer,
- finalize_command_builder, 0, 0,
+ finalize_command_builder, 0, 0, 0,
struct command_builder);
\f
static void
struct command_builder);
\f
static void
@@
-432,7
+432,7
@@
allocate_command_builder (Lisp_Object console)
{
Lisp_Object builder_obj;
struct command_builder *builder =
{
Lisp_Object builder_obj;
struct command_builder *builder =
- alloc_lcrecord_type (struct command_builder, lrecord_command_builder);
+ alloc_lcrecord_type (struct command_builder, &lrecord_command_builder);
builder->console = console;
reset_command_builder_event_chain (builder);
builder->console = console;
reset_command_builder_event_chain (builder);
@@
-5047,7
+5047,7
@@
Errors running the hook are caught and ignored.
*Variable to control XEmacs behavior with respect to focus changing.
If this variable is set to t, then XEmacs will not gratuitously change
the keyboard focus. XEmacs cannot in general detect when this mode is
*Variable to control XEmacs behavior with respect to focus changing.
If this variable is set to t, then XEmacs will not gratuitously change
the keyboard focus. XEmacs cannot in general detect when this mode is
-use by the window manager, so it is up to the user to set it.
+used by the window manager, so it is up to the user to set it.
*/ );
focus_follows_mouse = 0;
*/ );
focus_follows_mouse = 0;
@@
-5374,8
+5374,7
@@
init_event_stream (void)
if (initialized)
{
#ifdef HAVE_UNIXOID_EVENT_LOOP
if (initialized)
{
#ifdef HAVE_UNIXOID_EVENT_LOOP
- /* if (strcmp (display_use, "mswindows") != 0)*/
- init_event_unixoid ();
+ init_event_unixoid ();
#endif
#ifdef HAVE_X_WINDOWS
if (!strcmp (display_use, "x"))
#endif
#ifdef HAVE_X_WINDOWS
if (!strcmp (display_use, "x"))
@@
-5390,12
+5389,14
@@
init_event_stream (void)
{
/* For TTY's, use the Xt event loop if we can; it allows
us to later open an X connection. */
{
/* For TTY's, use the Xt event loop if we can; it allows
us to later open an X connection. */
-#if defined (HAVE_X_WINDOWS) && !defined (DEBUG_TTY_EVENT_STREAM)
+#if defined (HAVE_MS_WINDOWS) && (!defined (HAVE_TTY) \
+ || (defined (HAVE_MSG_SELECT) \
+ && !defined (DEBUG_TTY_EVENT_STREAM)))
+ init_event_mswindows_late ();
+#elif defined (HAVE_X_WINDOWS) && !defined (DEBUG_TTY_EVENT_STREAM)
init_event_Xt_late ();
#elif defined (HAVE_TTY)
init_event_tty_late ();
init_event_Xt_late ();
#elif defined (HAVE_TTY)
init_event_tty_late ();
-#elif defined (HAVE_MS_WINDOWS)
- init_event_mswindows_late ();
#endif
}
init_interrupts_late ();
#endif
}
init_interrupts_late ();