diff --git a/src/ChangeLog b/src/ChangeLog
index 44d6e613b20..4fb88d75810 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2002-07-15  Ken Raeburn  <raeburn@gnu.org>
+
+	* lisp.h (STRING_INTERVALS): Produce rvalue.
+	(STRING_SET_INTERVALS): New macro.
+	* buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Use it.
+	* fns.c (Fstring_as_multibyte): Likewise.
+	* intervals.c (create_root_interval,
+	balance_possible_root_interval, delete_interval,
+	copy_intervals_to_string): Likewise.
+	* textprop.c (set_text_properties): Likewise.  Use NULL_INTERVAL
+	instead of 0.
+
 2002-07-14  Ken Raeburn  <raeburn@gnu.org>
 
 	* lisp.h (STRING_SET_CHARS): New macro.
diff --git a/src/textprop.c b/src/textprop.c
index bf23f6a34aa..62e9446426e 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1311,7 +1311,7 @@ set_text_properties (start, end, properties, object, signal_after_change_p)
       if (! STRING_INTERVALS (object))
 	return Qt;
 
-      STRING_INTERVALS (object) = 0;
+      STRING_SET_INTERVALS (object, NULL_INTERVAL);
       return Qt;
     }