Lisp_Object/int mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d9d25fa99cfc498469ef806c32cf7fb6dd6c42b..72df8c4ad0eeb6ebf7af8d36b1b79d2dd67e1ebd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/data.c b/src/data.c
index 9268d04b04f25aff1fff1c970451b1fd4c1f65f0..bff2baaed272eb37bb3a9d1b624c68851bd788d1 100644 (file)
--- 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 0ceffad34f4f6f4f9b94fef6b7bd238de4ab05c7..cc19ef384ad6460cd36fde5c19ea1b4999b5b3bc 100644 (file)
--- 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 de62a646984f89aa43e7adccba20bb8fbaead5d5..8e0cf0d89adab9c15ffba242e379396aaf7353e3 100644 (file)
--- 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 520be0cda80f95be3138e6a49d5bcb4462173762..b4d61f7c9a97d7a5b70029939cf2dd94a14c84df 100644 (file)
--- 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,