diff options
| author | Karl Heuer | 1994-02-03 18:54:04 +0000 |
|---|---|---|
| committer | Karl Heuer | 1994-02-03 18:54:04 +0000 |
| commit | 550bd63a2cd113504605de0bd38a33c047e1ccd6 (patch) | |
| tree | 4488907f9823b92c4e0f888666a7c3c5ddf17621 /src | |
| parent | 03ef66853f545fbb98466449f0d4d0cbe0a6959b (diff) | |
| download | emacs-550bd63a2cd113504605de0bd38a33c047e1ccd6.tar.gz emacs-550bd63a2cd113504605de0bd38a33c047e1ccd6.zip | |
(merge_properties_sticky): Preserve original order of properties.
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 2a946e6da0b..067f62c3053 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -304,7 +304,7 @@ rotate_right (interval) | |||
| 304 | if (! NULL_INTERVAL_P (i)) | 304 | if (! NULL_INTERVAL_P (i)) |
| 305 | i->parent = interval; | 305 | i->parent = interval; |
| 306 | 306 | ||
| 307 | /* A's total length is decreased by the length of B and it's left child. */ | 307 | /* A's total length is decreased by the length of B and its left child. */ |
| 308 | interval->total_length -= B->total_length - LEFT_TOTAL_LENGTH (interval); | 308 | interval->total_length -= B->total_length - LEFT_TOTAL_LENGTH (interval); |
| 309 | 309 | ||
| 310 | /* B must have the same total length of A. */ | 310 | /* B must have the same total length of A. */ |
| @@ -348,7 +348,7 @@ rotate_left (interval) | |||
| 348 | if (! NULL_INTERVAL_P (i)) | 348 | if (! NULL_INTERVAL_P (i)) |
| 349 | i->parent = interval; | 349 | i->parent = interval; |
| 350 | 350 | ||
| 351 | /* A's total length is decreased by the length of B and it's right child. */ | 351 | /* A's total length is decreased by the length of B and its right child. */ |
| 352 | interval->total_length -= B->total_length - RIGHT_TOTAL_LENGTH (interval); | 352 | interval->total_length -= B->total_length - RIGHT_TOTAL_LENGTH (interval); |
| 353 | 353 | ||
| 354 | /* B must have the same total length of A. */ | 354 | /* B must have the same total length of A. */ |
| @@ -726,7 +726,7 @@ adjust_intervals_for_insertion (tree, position, length) | |||
| 726 | 726 | ||
| 727 | /* Effect an adjustment corresponding to the addition of LENGTH characters | 727 | /* Effect an adjustment corresponding to the addition of LENGTH characters |
| 728 | of text. Do this by finding the interval containing POSITION in the | 728 | of text. Do this by finding the interval containing POSITION in the |
| 729 | interval tree TREE, and then adjusting all of it's ancestors by adding | 729 | interval tree TREE, and then adjusting all of its ancestors by adding |
| 730 | LENGTH to them. | 730 | LENGTH to them. |
| 731 | 731 | ||
| 732 | If POSITION is the first character of an interval, meaning that point | 732 | If POSITION is the first character of an interval, meaning that point |
| @@ -927,12 +927,12 @@ merge_properties_sticky (pleft, pright) | |||
| 927 | rear = Fcons (sym, rear); | 927 | rear = Fcons (sym, rear); |
| 928 | } | 928 | } |
| 929 | } | 929 | } |
| 930 | props = Fnreverse (props); | ||
| 930 | if (! NILP (front)) | 931 | if (! NILP (front)) |
| 931 | props = Fcons (Qfront_sticky, Fcons (front, props)); | 932 | props = Fcons (Qfront_sticky, Fcons (Fnreverse (front), props)); |
| 932 | if (! NILP (rear)) | 933 | if (! NILP (rear)) |
| 933 | props = Fcons (Qrear_nonsticky, Fcons (rear, props)); | 934 | props = Fcons (Qrear_nonsticky, Fcons (Fnreverse (rear), props)); |
| 934 | return props; | 935 | return props; |
| 935 | |||
| 936 | } | 936 | } |
| 937 | 937 | ||
| 938 | 938 | ||