# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1174664568 0
# Node ID f071ad404b3065309393d441be28d08ade19dd15
# Parent  b18589e1010204c8042c7c5485c38005dff64880
(merge_properties, intervals_equal):
Use Fplist_member instead of Fmemq to find properties.

diff -r b18589e10102 -r f071ad404b30 src/intervals.c
--- a/src/intervals.c	Fri Mar 23 15:42:08 2007 +0000
+++ b/src/intervals.c	Fri Mar 23 15:42:48 2007 +0000
@@ -125,7 +125,7 @@
   while (CONSP (o))
     {
       sym = XCAR (o);
-      val = Fmemq (sym, target->plist);
+      val = Fplist_member (sym, target->plist);
 
       if (NILP (val))
 	{
@@ -168,7 +168,7 @@
 	return 0;
 
       i0_sym = XCAR (i0_cdr);
-      i1_val = Fmemq (i0_sym, i1->plist);
+      i1_val = Fplist_member (i0_sym, i1->plist);
 
       /* i0 has something i1 doesn't.  */
       if (EQ (i1_val, Qnil))
@@ -2538,7 +2538,7 @@
 	  temp = CHAR_TO_BYTE (left_end);
 
 	  /* If LEFT_END_BYTE is in the middle of a character,
-	     adjust it and LEFT_END to a char boundary.  */ 
+	     adjust it and LEFT_END to a char boundary.  */
 	  if (left_end_byte > temp)
 	    {
 	      left_end_byte = temp;
@@ -2570,7 +2570,7 @@
 	  right_start = BYTE_TO_CHAR (right_start_byte);
 
 	  /* If RIGHT_START_BYTE is in the middle of a character,
-	     adjust it and RIGHT_START to a char boundary.  */ 
+	     adjust it and RIGHT_START to a char boundary.  */
 	  temp = CHAR_TO_BYTE (right_start);
 
 	  if (right_start_byte < temp)