Mercurial > emacs
changeset 53966:26dc8943ee64
Lisp_Object/int mixup.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 16 Feb 2004 04:53:28 +0000 |
| parents | af02111da3e1 |
| children | c0b52e41d35d |
| files | src/ChangeLog src/data.c src/fringe.c src/xdisp.c src/xselect.c |
| diffstat | 5 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Feb 16 03:18:25 2004 +0000 +++ b/src/ChangeLog Mon Feb 16 04:53:28 2004 +0000 @@ -1,3 +1,10 @@ +2004-02-15 Stefan Monnier <monnier@iro.umontreal.ca> + + * data.c (Fbyteorder): + * fringe.c (Fdefine_fringe_bitmap): + * xdisp.c (handle_single_display_prop): + * xselect.c (x_handle_dnd_message): Lisp_Object/int mixup. + 2004-02-16 Jason Rumney <jasonr@gnu.org> * w32term.c (w32_draw_fringe_bitmap): Handle overlay fringe bitmaps.
--- a/src/data.c Mon Feb 16 03:18:25 2004 +0000 +++ b/src/data.c Mon Feb 16 04:53:28 2004 +0000 @@ -2889,7 +2889,7 @@ unsigned i = 0x04030201; int order = *(char *)&i == 4 ? 66 : 108; - return XFASTINT (order); + return make_number (order); }
--- a/src/fringe.c Mon Feb 16 03:18:25 2004 +0000 +++ b/src/fringe.c Mon Feb 16 04:53:28 2004 +0000 @@ -1165,7 +1165,7 @@ if (NILP (which)) { if (max_used_fringe_bitmap < MAX_FRINGE_BITMAPS) - n = make_number (max_used_fringe_bitmap++); + n = max_used_fringe_bitmap++; else { for (n = MAX_STANDARD_FRINGE_BITMAPS;
--- a/src/xdisp.c Mon Feb 16 03:18:25 2004 +0000 +++ b/src/xdisp.c Mon Feb 16 04:53:28 2004 +0000 @@ -3513,12 +3513,12 @@ if (EQ (XCAR (prop), Qleft_fringe)) { - it->left_user_fringe_bitmap = value; + it->left_user_fringe_bitmap = XINT (value); it->left_user_fringe_face_id = face_id; } else { - it->right_user_fringe_bitmap = value; + it->right_user_fringe_bitmap = XINT (value); it->right_user_fringe_face_id = face_id; } #endif /* HAVE_WINDOW_SYSTEM */
--- a/src/xselect.c Mon Feb 16 03:18:25 2004 +0000 +++ b/src/xselect.c Mon Feb 16 04:53:28 2004 +0000 @@ -2503,11 +2503,11 @@ XSETFRAME (frame, f); - vec = Fmake_vector (4, Qnil); + vec = Fmake_vector (make_number (4), Qnil); AREF (vec, 0) = SYMBOL_NAME (x_atom_to_symbol (FRAME_X_DISPLAY (f), event->message_type)); AREF (vec, 1) = frame; - AREF (vec, 2) = XFASTINT (event->format); + AREF (vec, 2) = make_number (event->format); AREF (vec, 3) = x_property_data_to_lisp (f, event->data.b, event->message_type,