# HG changeset patch
# User Ken Raeburn <raeburn@raeburn.org>
# Date 1026841034 0
# Node ID 218b993085697480d9dbdbee0542aecee4173363
# Parent  8e01c92219ab77820fb3c83b9805fd121073b396
(validate_interval_range, interval_of): Use string macros instead of
Lisp_String fields.

diff -r 8e01c92219ab -r 218b99308569 src/textprop.c
--- a/src/textprop.c	Tue Jul 16 17:35:50 2002 +0000
+++ b/src/textprop.c	Tue Jul 16 17:37:14 2002 +0000
@@ -158,17 +158,17 @@
     }
   else
     {
-      register struct Lisp_String *s = XSTRING (object);
+      int len = SCHARS (object);
 
       if (! (0 <= XINT (*begin) && XINT (*begin) <= XINT (*end)
-	     && XINT (*end) <= s->size))
+	     && XINT (*end) <= len))
 	args_out_of_range (*begin, *end);
       XSETFASTINT (*begin, XFASTINT (*begin));
       if (begin != end)
 	XSETFASTINT (*end, XFASTINT (*end));
-      i = s->intervals;
+      i = STRING_INTERVALS (object);
 
-      if (s->size == 0)
+      if (len == 0)
 	return NULL_INTERVAL;
 
       searchpos = XINT (*begin);
@@ -553,11 +553,9 @@
     }
   else
     {
-      register struct Lisp_String *s = XSTRING (object);
-
       beg = 0;
-      end = s->size;
-      i = s->intervals;
+      end = SCHARS (object);
+      i = STRING_INTERVALS (object);
     }
 
   if (!(beg <= position && position <= end))