* textprop.c (set_text_properties): Use STRING_SET_INTERVALS.

diff --git a/src/ChangeLog b/src/ChangeLog
index 44d6e613b207b0a5f9e4542dfe379bd70024fc79..4fb88d7581090e1cba436359b66b0a0617921848 100644 (file)
--- 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 bf23f6a34aaaf52ef3d8dfbf9f3368a7cd38ec49..62e9446426efe1e4247d54ba91033d3b047e6e85 100644 (file)
--- 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;
     }