2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 66061c74810..bffe8caf089 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-05  Ken Raeburn  <raeburn@raeburn.org>
+
+        * editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup.
+
 2006-02-03  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c: Cache last merged escape glyph face.
diff --git a/src/editfns.c b/src/editfns.c
index 9be9232a9c7..5bf4eb738ae 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -719,7 +719,8 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil.  */)
 {
   /* If non-zero, then the original point, before re-positioning.  */
   int orig_point = 0;
-  int fwd, prev_old, prev_new;
+  int fwd;
+  Lisp_Object prev_old, prev_new;
   
   if (NILP (new_pos))
     /* Use the current point, and afterwards, set it.  */