procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused macros from intervals.h.

Browse source 
* intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove.
* intervals.c: Adjust comment.
This commit is contained in:
Dmitry Antipov 2012-08-10 13:04:19 +04:00
parent 9b855fd632
commit 65e8ee5293
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-08-10 Dmitry Antipov <dmantipov@yandex.ru>
Remove unused macros from intervals.h.
* intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove.
* intervals.c: Adjust comment.
2012-08-10 Eli Zaretskii <eliz@gnu.org>
* w32fns.c <w32_unicode_gui>: New static variable.

8
src/intervals.c
View file

@ -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),

9
src/intervals.h
View file

@ -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)))