summaryrefslogtreecommitdiff
path: root/src/textprop.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2012-08-08 14:23:04 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2012-08-08 14:23:04 +0400
commitad8c997f72c95b7351eab4c8ea2ac8c667545e6f (patch)
tree95f6da158be105a5a83a31c087764ce1d7eb7944 /src/textprop.c
parentce0fcefa27728a4e83e10962075c388c8a6da87a (diff)
downloademacs-ad8c997f72c95b7351eab4c8ea2ac8c667545e6f.tar.gz
Inline functions to examine and change string intervals.
* lisp.h (STRING_INTERVALS, STRING_SET_INTERVALS): Remove. (string_get_intervals, string_set_intervals): New function. * alloc.c, buffer.c, editfns.c, fns.c, insdel.c, intervals.c: * lread.c, print.c, textprop.c: Adjust users.
Diffstat (limited to 'src/textprop.c')
-rw-r--r--src/textprop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/textprop.c b/src/textprop.c
index 1ec1ab11d2e..5366249be89 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -161,7 +161,7 @@ validate_interval_range (Lisp_Object object, Lisp_Object *begin, Lisp_Object *en
XSETFASTINT (*begin, XFASTINT (*begin));
if (begin != end)
XSETFASTINT (*end, XFASTINT (*end));
- i = STRING_INTERVALS (object);
+ i = string_get_intervals (object);
if (len == 0)
return NULL;
@@ -516,7 +516,7 @@ interval_of (ptrdiff_t position, Lisp_Object object)
{
beg = 0;
end = SCHARS (object);
- i = STRING_INTERVALS (object);
+ i = string_get_intervals (object);
}
if (!(beg <= position && position <= end))
@@ -1274,10 +1274,10 @@ set_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object properties,
&& XFASTINT (start) == 0
&& XFASTINT (end) == SCHARS (object))
{
- if (! STRING_INTERVALS (object))
+ if (!string_get_intervals (object))
return Qnil;
- STRING_SET_INTERVALS (object, NULL);
+ string_set_intervals (object, NULL);
return Qt;
}