projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use `hanyu-dazidian' instead of `hanyu-dazidian-vol',
[chise/xemacs-chise.git]
/
src
/
event-stream.c
diff --git
a/src/event-stream.c
b/src/event-stream.c
index
d6a5cfe
..
847ab65
100644
(file)
--- a/
src/event-stream.c
+++ b/
src/event-stream.c
@@
-100,7
+100,7
@@
Boston, MA 02111-1307, USA. */
#include <errno.h>
/* The number of keystrokes between auto-saves. */
#include <errno.h>
/* The number of keystrokes between auto-saves. */
-static int auto_save_interval;
+static Fixnum auto_save_interval;
Lisp_Object Qundefined_keystroke_sequence;
Lisp_Object Qundefined_keystroke_sequence;
@@
-250,7
+250,7
@@
Lisp_Object Qself_insert_defer_undo;
extern Lisp_Object Fmake_keymap (Lisp_Object name);
#ifdef DEBUG_XEMACS
extern Lisp_Object Fmake_keymap (Lisp_Object name);
#ifdef DEBUG_XEMACS
-int debug_emacs_events;
+Fixnum debug_emacs_events;
static void
external_debugging_print_event (char *event_description, Lisp_Object event)
static void
external_debugging_print_event (char *event_description, Lisp_Object event)
@@
-1807,7
+1807,8
@@
emacs_handle_focus_change_preliminary (Lisp_Object frame_inp_and_dev)
MARK_WINDOWS_CHANGED (w);
}
MARK_WINDOWS_CHANGED (w);
}
- if (FRAMEP (focus_frame) && !EQ (frame, focus_frame))
+ if (FRAMEP (focus_frame) && FRAME_LIVE_P (XFRAME (focus_frame))
+ && !EQ (frame, focus_frame))
{
/* Oops, we missed a focus-out event. */
DEVICE_FRAME_WITH_FOCUS_REAL (d) = Qnil;
{
/* Oops, we missed a focus-out event. */
DEVICE_FRAME_WITH_FOCUS_REAL (d) = Qnil;
@@
-4469,12
+4470,12
@@
vars_of_event_stream (void)
Vthis_command_keys = Qnil;
staticpro (&Vthis_command_keys);
Vthis_command_keys_tail = Qnil;
Vthis_command_keys = Qnil;
staticpro (&Vthis_command_keys);
Vthis_command_keys_tail = Qnil;
- pdump_wire (&Vthis_command_keys_tail);
+ dump_add_root_object (&Vthis_command_keys_tail);
command_event_queue = Qnil;
staticpro (&command_event_queue);
command_event_queue_tail = Qnil;
command_event_queue = Qnil;
staticpro (&command_event_queue);
command_event_queue_tail = Qnil;
- pdump_wire (&command_event_queue_tail);
+ dump_add_root_object (&command_event_queue_tail);
Vlast_selected_frame = Qnil;
staticpro (&Vlast_selected_frame);
Vlast_selected_frame = Qnil;
staticpro (&Vlast_selected_frame);