[Emacs-diffs] /srv/bzr/emacs/trunk r109546: Remove unused macros from intervals.h.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109546
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-10 13:04:19 +0400
message:
  Remove unused macros from intervals.h.
  * intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove.
  * intervals.c: Adjust comment.
modified:
  src/ChangeLog
  src/intervals.c
  src/intervals.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-10 07:16:58 +0000
+++ b/src/ChangeLog     2012-08-10 09:04:19 +0000
@@ -1,3 +1,9 @@
+2012-08-10  Dmitry Antipov  <address@hidden>
+
+       Remove unused macros from intervals.h.
+       * intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove.
+       * intervals.c: Adjust comment.
+
 2012-08-10  Eli Zaretskii  <address@hidden>
 
        * w32fns.c <w32_unicode_gui>: New static variable.

=== modified file 'src/intervals.c'
--- a/src/intervals.c   2012-08-08 14:47:11 +0000
+++ b/src/intervals.c   2012-08-10 09:04:19 +0000
@@ -1559,11 +1559,9 @@
    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),

=== modified file 'src/intervals.h'
--- a/src/intervals.h   2012-08-08 06:11:29 +0000
+++ b/src/intervals.h   2012-08-10 09:04:19 +0000
@@ -213,15 +213,6 @@
   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)))