From 3a62677f476dc9dd9419a9cbc77cc2afe2f99d2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Jan=C3=ADk?= Date: Sun, 9 Dec 2001 01:03:22 +0000 Subject: [PATCH] (merge_properties_sticky): Likewise. --- src/ChangeLog | 12 ++++++++++++ src/intervals.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5dc65795829..f0c67b814ad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2001-12-09 Pavel Jan,Bm(Bk + + * charset.c (char_to_string_1, translate_char, Fdefine_charset): + Add parentheses around && within ||. + + * indent.c (compute_motion): Likewise. + + * intervals.c (merge_properties_sticky): Likewise. + + * coding.c (setup_coding_system, shrink_encoding_region) + (Fdecode_sjis_char): Likewise. + 2001-12-07 Andreas Schwab * xdisp.c (display_mode_element): Don't read past end of string if diff --git a/src/intervals.c b/src/intervals.c index c1a088b1065..5a6ff4f47d5 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1135,7 +1135,7 @@ merge_properties_sticky (pleft, pright) tmp = Fassq (sym, Vtext_property_default_nonsticky); use_left = (lpresent && ! (TMEM (sym, lrear) - || CONSP (tmp) && ! NILP (XCDR (tmp)))); + || (CONSP (tmp) && ! NILP (XCDR (tmp))))); use_right = (TMEM (sym, rfront) || (CONSP (tmp) && NILP (XCDR (tmp)))); if (use_left && use_right) -- 2.39.5