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/w32notify.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/w32notify.c')
-rw-r--r-- | src/w32notify.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32notify.c b/src/w32notify.c index a0d555b4786..ab6cd12ab93 100644 --- a/src/w32notify.c +++ b/src/w32notify.c @@ -580,7 +580,7 @@ generate notifications correctly, though. */) report_file_error ("Cannot watch file", Fcons (file, Qnil)); } /* Store watch object in watch list. */ - watch_descriptor = XIL ((EMACS_INT)dirwatch); + watch_descriptor = make_pointer_integer (dirwatch); watch_object = Fcons (watch_descriptor, callback); watch_list = Fcons (watch_object, watch_list); @@ -605,7 +605,7 @@ WATCH-DESCRIPTOR should be an object returned by `w32notify-add-watch'. */) if (!NILP (watch_object)) { watch_list = Fdelete (watch_object, watch_list); - dirwatch = (struct notification *)XLI (watch_descriptor); + dirwatch = (struct notification *)XINTPTR (watch_descriptor); if (w32_valid_pointer_p (dirwatch, sizeof(struct notification))) status = remove_watch (dirwatch); } @@ -620,7 +620,7 @@ WATCH-DESCRIPTOR should be an object returned by `w32notify-add-watch'. */) Lisp_Object w32_get_watch_object (void *desc) { - Lisp_Object descriptor = XIL ((EMACS_INT)desc); + Lisp_Object descriptor = make_pointer_integer (desc); /* This is called from the input queue handling code, inside a critical section, so we cannot possibly QUIT if watch_list is not |