From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 25 Oct 2001 04:20:08 +0000 (+0000)
Subject: (text_property_stickiness): Fix Lisp_Object used as boolean.
X-Git-Tag: ttn-vms-21-2-B4~19176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1010ebe167d983d2e2c8ea1646f0369834ace13;p=emacs.git

(text_property_stickiness): Fix Lisp_Object used as boolean.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6a6689e474f..fd847f415d5 100644
--- 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 93f32717299..77bb39df691 100644
--- 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;
     }