diff options
| author | Joseph Arceneaux | 1992-10-03 00:05:48 +0000 |
|---|---|---|
| committer | Joseph Arceneaux | 1992-10-03 00:05:48 +0000 |
| commit | 7b1d5b85f814f1a574a602b02794e476c79996cf (patch) | |
| tree | 2a89c3a956f85fc9acbb1608f787a5b922aa218e /src | |
| parent | cebd887d3a826a6c493f933ecf02b62df779750a (diff) | |
| download | emacs-7b1d5b85f814f1a574a602b02794e476c79996cf.tar.gz emacs-7b1d5b85f814f1a574a602b02794e476c79996cf.zip | |
* intervals.c: `copy_intervals()' no longer static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/intervals.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/intervals.c b/src/intervals.c index f1fdd9ed2cc..bffb7a7aabe 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -655,7 +655,7 @@ adjust_intervals_for_insertion (tree, position, length) | |||
| 655 | /* If both intervals are sticky here, then default to the | 655 | /* If both intervals are sticky here, then default to the |
| 656 | left-most one. But perhaps we should create a new | 656 | left-most one. But perhaps we should create a new |
| 657 | interval here instead... */ | 657 | interval here instead... */ |
| 658 | if (END_STICKY (prev)) | 658 | if (END_STICKY_P (prev)) |
| 659 | i = prev; | 659 | i = prev; |
| 660 | } | 660 | } |
| 661 | 661 | ||
| @@ -1167,7 +1167,7 @@ graft_intervals_into_buffer (source, position, buffer) | |||
| 1167 | /* First interval -- none precede it. */ | 1167 | /* First interval -- none precede it. */ |
| 1168 | if (position == 1) | 1168 | if (position == 1) |
| 1169 | { | 1169 | { |
| 1170 | if (! FRONT_STICKY (under)) | 1170 | if (! FRONT_STICKY_P (under)) |
| 1171 | /* The inserted string keeps its own properties. */ | 1171 | /* The inserted string keeps its own properties. */ |
| 1172 | while (! NULL_INTERVAL_P (over)) | 1172 | while (! NULL_INTERVAL_P (over)) |
| 1173 | { | 1173 | { |
| @@ -1195,9 +1195,9 @@ graft_intervals_into_buffer (source, position, buffer) | |||
| 1195 | if (NULL_INTERVAL_P (prev)) | 1195 | if (NULL_INTERVAL_P (prev)) |
| 1196 | abort (); | 1196 | abort (); |
| 1197 | 1197 | ||
| 1198 | if (END_STICKY (prev)) | 1198 | if (END_STICKY_P (prev)) |
| 1199 | { | 1199 | { |
| 1200 | if (FRONT_STICKY (under)) | 1200 | if (FRONT_STICKY_P (under)) |
| 1201 | /* The intervals go inbetween as the two sticky | 1201 | /* The intervals go inbetween as the two sticky |
| 1202 | properties cancel each other. Should we change | 1202 | properties cancel each other. Should we change |
| 1203 | this policy? */ | 1203 | this policy? */ |
| @@ -1222,7 +1222,7 @@ graft_intervals_into_buffer (source, position, buffer) | |||
| 1222 | } | 1222 | } |
| 1223 | else | 1223 | else |
| 1224 | { | 1224 | { |
| 1225 | if (FRONT_STICKY (under)) | 1225 | if (FRONT_STICKY_P (under)) |
| 1226 | /* The inserted text "sticks" to the interval `under', | 1226 | /* The inserted text "sticks" to the interval `under', |
| 1227 | which means it gets those properties. */ | 1227 | which means it gets those properties. */ |
| 1228 | while (! NULL_INTERVAL_P (over)) | 1228 | while (! NULL_INTERVAL_P (over)) |
| @@ -1507,7 +1507,7 @@ balance_intervals (tree) | |||
| 1507 | /* Produce an interval tree reflecting the intervals in | 1507 | /* Produce an interval tree reflecting the intervals in |
| 1508 | TREE from START to START + LENGTH. */ | 1508 | TREE from START to START + LENGTH. */ |
| 1509 | 1509 | ||
| 1510 | static INTERVAL | 1510 | INTERVAL |
| 1511 | copy_intervals (tree, start, length) | 1511 | copy_intervals (tree, start, length) |
| 1512 | INTERVAL tree; | 1512 | INTERVAL tree; |
| 1513 | int start, length; | 1513 | int start, length; |