diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-01-10 13:27:35 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-01-10 13:27:35 +0200 |
| commit | 485763c0dcdc4f5ab1030f4bae6acbbe0ce9497e (patch) | |
| tree | d5920af2c0ef767a62051a5797ad60ddaca8efdc /src/w32inevt.c | |
| parent | c2208b3d913c2e53b96d7f11b31422a57366f601 (diff) | |
| download | emacs-485763c0dcdc4f5ab1030f4bae6acbbe0ce9497e.tar.gz | |
MS-Windows followup for change in semantics of XIL and XLI. (Bug#15880)
src/w32fns.c (Fw32_register_hot_key): Use XINT instead of XLI.
src/w32notify.c (Fw32notify_add_watch, w32_get_watch_object): Use
make_pointer_integer instead of XIL.
(Fw32notify_rm_watch): Use XINTPTR instead of XLI.
src/w32inevt.c (handle_file_notifications): Use make_pointer_integer
instead of XIL. Put a list of the descriptor, action, and file
name in event->arg, instead of spreading them between event->code
and event->arg.
src/w32term.c (queue_notifications): Use make_pointer_integer
instead of XIL. Put a list of the descriptor, action, and file
name in event->arg, instead of spreading them between event->code
and event->arg.
src/keyboard.c (kbd_buffer_get_event) [HAVE_W32NOTIFY]: Adjust Lisp
event creation to changes in w32term.c and w32inevt.c above.
Diffstat (limited to 'src/w32inevt.c')
| -rw-r--r-- | src/w32inevt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/w32inevt.c b/src/w32inevt.c index daf4a5c2375..e09903f99be 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -657,11 +657,12 @@ handle_file_notifications (struct input_event *hold_quit) Lisp_Object action = lispy_file_action (fni->Action); inev.kind = FILE_NOTIFY_EVENT; - inev.code = (ptrdiff_t)XINT (XIL ((EMACS_INT)notifications_desc)); inev.timestamp = GetTickCount (); inev.modifiers = 0; inev.frame_or_window = callback; inev.arg = Fcons (action, fname); + inev.arg = list3 (make_pointer_integer (notifications_desc), + action, fname); kbd_buffer_store_event_hold (&inev, hold_quit); if (!fni->NextEntryOffset) |