aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Blandy1993-07-06 02:23:22 +0000
committerJim Blandy1993-07-06 02:23:22 +0000
commit734c51b2dd0d010be568ce950c62d2aea883bb8c (patch)
tree3c9a049c67383065aa96dbb431d823fe9fe4374d /src
parent657070acda0f1897d0f4768ec621b8831ca9840a (diff)
downloademacs-734c51b2dd0d010be568ce950c62d2aea883bb8c.tar.gz
emacs-734c51b2dd0d010be568ce950c62d2aea883bb8c.zip
Compare the values of text properties using EQ, not Fequal.
* intervals.c (intervals_equal): Call EQ, not Fequal. * textprop.c (interval_has_all_properties, add_properties): Same.
Diffstat (limited to 'src')
-rw-r--r--src/intervals.c2
-rw-r--r--src/textprop.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/intervals.c b/src/intervals.c
index 1e57fd15632..81bf0b123ad 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -159,7 +159,7 @@ intervals_equal (i0, i1)
159 159
160 /* i0 and i1 both have sym, but it has different values in each */ 160 /* i0 and i1 both have sym, but it has different values in each */
161 i0_cdr = Fcdr (i0_cdr); 161 i0_cdr = Fcdr (i0_cdr);
162 if (NILP (Fequal (i1_val, Fcar (i0_cdr)))) 162 if (! EQ (i1_val, Fcar (i0_cdr)))
163 return 0; 163 return 0;
164 164
165 i0_cdr = Fcdr (i0_cdr); 165 i0_cdr = Fcdr (i0_cdr);
diff --git a/src/textprop.c b/src/textprop.c
index 384682cd256..3c62f0ad230 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -209,8 +209,7 @@ interval_has_all_properties (plist, i)
209 { 209 {
210 /* Found the same property on both lists. If the 210 /* Found the same property on both lists. If the
211 values are unequal, return zero. */ 211 values are unequal, return zero. */
212 if (! EQ (Fequal (Fcar (Fcdr (tail1)), Fcar (Fcdr (tail2))), 212 if (! EQ (Fcar (Fcdr (tail1)), Fcar (Fcdr (tail2))))
213 Qt))
214 return 0; 213 return 0;
215 214
216 /* Property has same value on both lists; go to next one. */ 215 /* Property has same value on both lists; go to next one. */
@@ -343,7 +342,7 @@ add_properties (plist, i, object)
343 342
344 /* The properties have the same value on both lists. 343 /* The properties have the same value on both lists.
345 Continue to the next property. */ 344 Continue to the next property. */
346 if (!NILP (Fequal (val1, Fcar (this_cdr)))) 345 if (EQ (val1, Fcar (this_cdr)))
347 break; 346 break;
348 347
349 /* Record this change in the buffer, for undo purposes. */ 348 /* Record this change in the buffer, for undo purposes. */