aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2001-10-25 04:20:08 +0000
committerStefan Monnier2001-10-25 04:20:08 +0000
commite1010ebe167d983d2e2c8ea1646f0369834ace13 (patch)
treed8e8072963a0e5af44b81d5d53ca2bdebf1f98a0 /src
parent2c9e19007488c25f18e1ad22e626fa9d815ba449 (diff)
downloademacs-e1010ebe167d983d2e2c8ea1646f0369834ace13.tar.gz
emacs-e1010ebe167d983d2e2c8ea1646f0369834ace13.zip
(text_property_stickiness): Fix Lisp_Object used as boolean.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6a6689e474f..fd847f415d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12001-10-25 Stefan Monnier <monnier@cs.yale.edu>
2
3 * editfns.c (text_property_stickiness): Fix Lisp_Object used as boolean.
4
12001-10-25 Miles Bader <miles@gnu.org> 52001-10-25 Miles Bader <miles@gnu.org>
2 6
3 * xfns.c (png_load): Make sure SPECIFIED_BG is a string. 7 * 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)
364 prev_pos = make_number (XINT (pos) - 1); 364 prev_pos = make_number (XINT (pos) - 1);
365 rear_non_sticky = Fget_text_property (prev_pos, Qrear_nonsticky, Qnil); 365 rear_non_sticky = Fget_text_property (prev_pos, Qrear_nonsticky, Qnil);
366 366
367 if (CONSP (rear_non_sticky) 367 if (!NILP (CONSP (rear_non_sticky)
368 ? Fmemq (prop, rear_non_sticky) 368 ? Fmemq (prop, rear_non_sticky)
369 : !NILP (rear_non_sticky)) 369 : rear_non_sticky))
370 /* PROP is rear-non-sticky. */ 370 /* PROP is rear-non-sticky. */
371 is_rear_sticky = 0; 371 is_rear_sticky = 0;
372 } 372 }