(text_property_stickiness): Fix Lisp_Object used as boolean.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6a6689e474f132e6aadc1e89ea0816f7ed795082..fd847f415d551068d69ce9966efaecca51f7badf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-25  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * editfns.c (text_property_stickiness): Fix Lisp_Object used as boolean.
+
 2001-10-25  Miles Bader  <miles@gnu.org>
 
        * xfns.c (png_load): Make sure SPECIFIED_BG is a string.

diff --git a/src/editfns.c b/src/editfns.c
index 93f327172991c77c648b09e611c2da9870319da3..77bb39df691d703c4511e80d33dad2d61610cdf4 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -364,9 +364,9 @@ text_property_stickiness (prop, pos)
       prev_pos = make_number (XINT (pos) - 1);
       rear_non_sticky = Fget_text_property (prev_pos, Qrear_nonsticky, Qnil);
 
-      if (CONSP (rear_non_sticky)
-         ? Fmemq (prop, rear_non_sticky)
-         : !NILP (rear_non_sticky))
+      if (!NILP (CONSP (rear_non_sticky)
+                ? Fmemq (prop, rear_non_sticky)
+                : rear_non_sticky))
        /* PROP is rear-non-sticky.  */
        is_rear_sticky = 0;
     }