summaryrefslogtreecommitdiff
path: root/src/insdel.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/insdel.c
parentce0fcefa27728a4e83e10962075c388c8a6da87a (diff)
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/insdel.c')
-rw-r--r--src/insdel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/insdel.c b/src/insdel.c
index 6cd46ac634..1a66cfc608 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -976,7 +976,7 @@ insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
offset_intervals (current_buffer, PT, nchars);
- intervals = STRING_INTERVALS (string);
+ intervals = string_get_intervals (string);
/* Get the intervals for the part of the string we are inserting. */
if (nbytes < SBYTES (string))
intervals = copy_intervals (intervals, pos, nchars);
@@ -1413,7 +1413,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
/* Get the intervals for the part of the string we are inserting--
not including the combined-before bytes. */
- intervals = STRING_INTERVALS (new);
+ intervals = string_get_intervals (new);
/* Insert those intervals. */
graft_intervals_into_buffer (intervals, from, inschars,
current_buffer, inherit);