From 65e8ee52931d3885fd75491a8f5b22ddc80c7208 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Fri, 10 Aug 2012 13:04:19 +0400 Subject: [PATCH] Remove unused macros from intervals.h. * intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove. * intervals.c: Adjust comment. --- src/ChangeLog | 6 ++++++ src/intervals.c | 8 +++----- src/intervals.h | 9 --------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b8b8ee7b3f4..79dcf0bbaa6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-08-10 Dmitry Antipov + + Remove unused macros from intervals.h. + * intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove. + * intervals.c: Adjust comment. + 2012-08-10 Eli Zaretskii * w32fns.c : New static variable. 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), diff --git a/src/intervals.h b/src/intervals.h index b50016eeb59..754b33f2ab9 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -213,15 +213,6 @@ interval_copy_parent (INTERVAL d, INTERVAL s) if ((from)->rear_sticky) (to)->rear_sticky = 1; \ } -/* Macro determining whether the properties of an interval being - inserted should be merged with the properties of the text where - they are being inserted. */ -#define MERGE_INSERTIONS(i) 1 - -/* Macro determining if an invisible interval should be displayed - as a special glyph, or not at all. */ -#define DISPLAY_INVISIBLE_GLYPH(i) 0 - /* Is this interval visible? Replace later with cache access. */ #define INTERVAL_VISIBLE_P(i) \ (i && NILP (textget ((i)->plist, Qinvisible))) -- 2.39.2