Mercurial > emacs

comparison src/intervals.c @ 76688:f071ad404b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(merge_properties, intervals_equal): Use Fplist_member instead of Fmemq to find properties.
author Kim F. Storm <storm@cua.dk>
date Fri, 23 Mar 2007 15:42:48 +0000
parents e90d04cd455a
children 9bb519568fdf
comparison
equal deleted inserted replaced
76687:b18589e10102 76688:f071ad404b30
123 123
124 o = source->plist; 124 o = source->plist;
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 {
132 o = XCDR (o); 132 o = XCDR (o);
133 CHECK_CONS (o); 133 CHECK_CONS (o);
166 /* Lengths of the two plists were unequal. */ 166 /* Lengths of the two plists were unequal. */
167 if (i1_len == 0) 167 if (i1_len == 0)
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))
175 return 0; 175 return 0;
176 176
2536 left_end = BYTE_TO_CHAR (left_end_byte); 2536 left_end = BYTE_TO_CHAR (left_end_byte);
2537 2537
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;
2545 } 2545 }
2546 if (left_end_byte < temp) 2546 if (left_end_byte < temp)
2568 2568
2569 right_start_byte = end_byte - RIGHT_TOTAL_LENGTH (i); 2569 right_start_byte = end_byte - RIGHT_TOTAL_LENGTH (i);
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)
2577 { 2577 {
2578 right_start_byte = temp; 2578 right_start_byte = temp;