diff options
| author | Stefan Monnier <[email protected]> | 2004-02-16 04:53:28 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2004-02-16 04:53:28 +0000 |
| commit | d2f1499943a598ad01625686b594e8d3c6ba4029 (patch) | |
| tree | 2c0f9c464d1adfc2471fb6b044aad8f57b41d0b4 /src | |
| parent | 783bcffa10c4e226086063f15d45cb2de7038421 (diff) | |
Lisp_Object/int mixup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/data.c | 2 | ||||
| -rw-r--r-- | src/fringe.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 4 | ||||
| -rw-r--r-- | src/xselect.c | 4 |
5 files changed, 13 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0d9d25fa99..72df8c4ad0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2004-02-15 Stefan Monnier <[email protected]> + + * 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 <[email protected]> * w32term.c (w32_draw_fringe_bitmap): Handle overlay fringe bitmaps. diff --git a/src/data.c b/src/data.c index 9268d04b04..bff2baaed2 100644 --- a/src/data.c +++ b/src/data.c @@ -2889,7 +2889,7 @@ lowercase l) for small endian machines. */) unsigned i = 0x04030201; int order = *(char *)&i == 4 ? 66 : 108; - return XFASTINT (order); + return make_number (order); } diff --git a/src/fringe.c b/src/fringe.c index 0ceffad34f..cc19ef384a 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1165,7 +1165,7 @@ Return new bitmap number, or nil of no more free bitmap slots. */) 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; diff --git a/src/xdisp.c b/src/xdisp.c index de62a64698..8e0cf0d89a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3513,12 +3513,12 @@ handle_single_display_prop (it, prop, object, position, 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 */ diff --git a/src/xselect.c b/src/xselect.c index 520be0cda8..b4d61f7c9a 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -2503,11 +2503,11 @@ x_handle_dnd_message (f, event, dpyinfo, bufp) 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, |