diff options
| author | Kim F. Storm | 2007-03-23 15:42:48 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2007-03-23 15:42:48 +0000 |
| commit | f813361dc33028ee85532c747555fed7f0dde392 (patch) | |
| tree | 5e510f1726a980d88b1bb7cedc128bd6cb90853c /src/intervals.c | |
| parent | be5ef8f0f316e5a05b2a362f97f685e662ae2599 (diff) | |
| download | emacs-f813361dc33028ee85532c747555fed7f0dde392.tar.gz emacs-f813361dc33028ee85532c747555fed7f0dde392.zip | |
(merge_properties, intervals_equal):
Use Fplist_member instead of Fmemq to find properties.
Diffstat (limited to 'src/intervals.c')
| -rw-r--r-- | src/intervals.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/intervals.c b/src/intervals.c index 861cb24c598..6c640dc5cd2 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -125,7 +125,7 @@ merge_properties (source, target) | |||
| 125 | while (CONSP (o)) | 125 | while (CONSP (o)) |
| 126 | { | 126 | { |
| 127 | sym = XCAR (o); | 127 | sym = XCAR (o); |
| 128 | val = Fmemq (sym, target->plist); | 128 | val = Fplist_member (sym, target->plist); |
| 129 | 129 | ||
| 130 | if (NILP (val)) | 130 | if (NILP (val)) |
| 131 | { | 131 | { |
| @@ -168,7 +168,7 @@ intervals_equal (i0, i1) | |||
| 168 | return 0; | 168 | return 0; |
| 169 | 169 | ||
| 170 | i0_sym = XCAR (i0_cdr); | 170 | i0_sym = XCAR (i0_cdr); |
| 171 | i1_val = Fmemq (i0_sym, i1->plist); | 171 | i1_val = Fplist_member (i0_sym, i1->plist); |
| 172 | 172 | ||
| 173 | /* i0 has something i1 doesn't. */ | 173 | /* i0 has something i1 doesn't. */ |
| 174 | if (EQ (i1_val, Qnil)) | 174 | if (EQ (i1_val, Qnil)) |
| @@ -2538,7 +2538,7 @@ set_intervals_multibyte_1 (i, multi_flag, start, start_byte, end, end_byte) | |||
| 2538 | temp = CHAR_TO_BYTE (left_end); | 2538 | temp = CHAR_TO_BYTE (left_end); |
| 2539 | 2539 | ||
| 2540 | /* If LEFT_END_BYTE is in the middle of a character, | 2540 | /* If LEFT_END_BYTE is in the middle of a character, |
| 2541 | adjust it and LEFT_END to a char boundary. */ | 2541 | adjust it and LEFT_END to a char boundary. */ |
| 2542 | if (left_end_byte > temp) | 2542 | if (left_end_byte > temp) |
| 2543 | { | 2543 | { |
| 2544 | left_end_byte = temp; | 2544 | left_end_byte = temp; |
| @@ -2570,7 +2570,7 @@ set_intervals_multibyte_1 (i, multi_flag, start, start_byte, end, end_byte) | |||
| 2570 | right_start = BYTE_TO_CHAR (right_start_byte); | 2570 | right_start = BYTE_TO_CHAR (right_start_byte); |
| 2571 | 2571 | ||
| 2572 | /* If RIGHT_START_BYTE is in the middle of a character, | 2572 | /* If RIGHT_START_BYTE is in the middle of a character, |
| 2573 | adjust it and RIGHT_START to a char boundary. */ | 2573 | adjust it and RIGHT_START to a char boundary. */ |
| 2574 | temp = CHAR_TO_BYTE (right_start); | 2574 | temp = CHAR_TO_BYTE (right_start); |
| 2575 | 2575 | ||
| 2576 | if (right_start_byte < temp) | 2576 | if (right_start_byte < temp) |