Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-437
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-438
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-209

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a1fa10e753c..6ba3196d4e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (dos_rawgetc): Use make_number to produce Lisp objects
+        for event.x and event.y.
+
 2004-07-01  Kenichi Handa  <handa@m17n.org>
 
         * w32select.c (Fw32_set_clipboard_data): Update `nbytes' correctly
diff --git a/src/msdos.c b/src/msdos.c
index da7fab89c7e..c9fbecf5cb2 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3456,8 +3456,8 @@ dos_rawgetc ()
                 event.code = button_num;
                 event.modifiers = dos_get_modifiers (0)
                   | (press ? down_modifier : up_modifier);
-                event.x = x;
-                event.y = y;
+                event.x = make_number (x);
+                event.y = make_number (y);
                 event.frame_or_window = selected_frame;
                 event.arg = Qnil;
                 event.timestamp = event_timestamp ();