(Fnext_char_property_change)

(Fprevious_char_property_change): allow marker as limit.
(Fnext_single_char_property_change)
(Fprevious_single_char_property_change): Check that limit is a
number in strings.
(Fnext_single_char_property_change): Coerce position to integer.
(Fprevious_single_char_property_change): Same here.

2 files changed, 24 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ffe7e872878..35961e71976 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-22  David Kastrup  <dak@gnu.org>
+
+        * textprop.c (Fnext_char_property_change)
+        (Fprevious_char_property_change): allow marker as limit.
+        (Fnext_single_char_property_change)
+        (Fprevious_single_char_property_change): Check that limit is a
+        number in strings.
+        (Fnext_single_char_property_change): Coerce position to integer.
+        (Fprevious_single_char_property_change): Same here.
+
 2005-03-21  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * s/openbsd.h (LD_SWITCH_SYSTEM_tmp): Define if undefined.
diff --git a/src/textprop.c b/src/textprop.c
index 317f8fa6aa3..e6dd411dcc5 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -729,7 +729,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
   temp = Fnext_overlay_change (position);
   if (! NILP (limit))
     {
-      CHECK_NUMBER (limit);
+      CHECK_NUMBER_COERCE_MARKER (limit);
       if (XINT (limit) < XINT (temp))
         temp = limit;
     }
@@ -754,7 +754,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
   temp = Fprevious_overlay_change (position);
   if (! NILP (limit))
     {
-      CHECK_NUMBER (limit);
+      CHECK_NUMBER_COERCE_MARKER (limit);
       if (XINT (limit) > XINT (temp))
         temp = limit;
     }
@@ -787,7 +787,10 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
           if (NILP (limit))
             position = make_number (SCHARS (object));
           else
-            position = limit;
+            {
+              CHECK_NUMBER (limit);
+              position = limit;
+            }
         }
     }
   else
@@ -804,6 +807,8 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
           Fset_buffer (object);
         }
 
+      CHECK_NUMBER_COERCE_MARKER (position);
+
       initial_value = Fget_char_property (position, prop, object);
 
       if (NILP (limit))
@@ -856,7 +861,10 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
           if (NILP (limit))
             position = make_number (SCHARS (object));
           else
-            position = limit;
+            {
+              CHECK_NUMBER (limit);
+              position = limit;
+            }
         }
     }
   else
@@ -872,6 +880,8 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
           Fset_buffer (object);
         }
 
+      CHECK_NUMBER_COERCE_MARKER (position);
+
       if (NILP (limit))
         XSETFASTINT (limit, BUF_BEGV (current_buffer));
       else