summaryrefslogtreecommitdiff
path: root/src/intervals.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2012-08-10 13:04:19 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2012-08-10 13:04:19 +0400
commit65e8ee52931d3885fd75491a8f5b22ddc80c7208 (patch)
treed7d174c76c216788d8c3e40000a9dc6c1e3c3a03 /src/intervals.c
parent9b855fd632dcbb86576a4a97f5f4196f0c75c102 (diff)
downloademacs-65e8ee52931d3885fd75491a8f5b22ddc80c7208.tar.gz
Remove unused macros from intervals.h.
* intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove. * intervals.c: Adjust comment.
Diffstat (limited to 'src/intervals.c')
-rw-r--r--src/intervals.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/intervals.c b/src/intervals.c
index 02ffe7ad90d..15dd67d06cb 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1559,11 +1559,9 @@ reproduce_tree_obj (INTERVAL source, Lisp_Object parent)
cases -- either insertion happened in the middle of some interval,
or between two intervals.
- If the text goes into the middle of an interval, then new
- intervals are created in the middle with only the properties of
- the new text, *unless* the macro MERGE_INSERTIONS is true, in
- which case the new text has the union of its properties and those
- of the text into which it was inserted.
+ If the text goes into the middle of an interval, then new intervals
+ are created in the middle, and new text has the union of its properties
+ and those of the text into which it was inserted.
If the text goes between two intervals, then if neither interval
had its appropriate sticky property set (front_sticky, rear_sticky),