diff options
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/buffer.c b/src/buffer.c index 9be2c4a970e..4da5b451d0f 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -2985,17 +2985,13 @@ overlays_in (ptrdiff_t beg, ptrdiff_t end, bool extend, | |||
| 2985 | if (node->begin > end) | 2985 | if (node->begin > end) |
| 2986 | { | 2986 | { |
| 2987 | next = min (next, node->begin); | 2987 | next = min (next, node->begin); |
| 2988 | ITREE_FOREACH_ABORT (); | ||
| 2989 | break; | 2988 | break; |
| 2990 | } | 2989 | } |
| 2991 | else if (node->begin == end) | 2990 | else if (node->begin == end) |
| 2992 | { | 2991 | { |
| 2993 | next = node->begin; | 2992 | next = node->begin; |
| 2994 | if ((! empty || end < ZV) && beg < end) | 2993 | if ((! empty || end < ZV) && beg < end) |
| 2995 | { | 2994 | break; |
| 2996 | ITREE_FOREACH_ABORT (); | ||
| 2997 | break; | ||
| 2998 | } | ||
| 2999 | if (empty && node->begin != node->end) | 2995 | if (empty && node->begin != node->end) |
| 3000 | continue; | 2996 | continue; |
| 3001 | } | 2997 | } |
| @@ -3050,7 +3046,6 @@ next_overlay_change (ptrdiff_t pos) | |||
| 3050 | of pos, because the search is limited to [pos,next) . */ | 3046 | of pos, because the search is limited to [pos,next) . */ |
| 3051 | eassert (node->begin < next); | 3047 | eassert (node->begin < next); |
| 3052 | next = node->begin; | 3048 | next = node->begin; |
| 3053 | ITREE_FOREACH_ABORT (); | ||
| 3054 | break; | 3049 | break; |
| 3055 | } | 3050 | } |
| 3056 | else if (node->begin < node->end && node->end < next) | 3051 | else if (node->begin < node->end && node->end < next) |
| @@ -3155,10 +3150,7 @@ overlay_touches_p (ptrdiff_t pos) | |||
| 3155 | pos. */ | 3150 | pos. */ |
| 3156 | ITREE_FOREACH (node, current_buffer->overlays, pos - 1, pos + 1, DESCENDING) | 3151 | ITREE_FOREACH (node, current_buffer->overlays, pos - 1, pos + 1, DESCENDING) |
| 3157 | if (node->begin == pos || node->end == pos) | 3152 | if (node->begin == pos || node->end == pos) |
| 3158 | { | 3153 | return true; |
| 3159 | ITREE_FOREACH_ABORT (); | ||
| 3160 | return true; | ||
| 3161 | } | ||
| 3162 | return false; | 3154 | return false; |
| 3163 | } | 3155 | } |
| 3164 | 3156 | ||