(merge_properties_sticky): Likewise.

2 files changed, 13 insertions, 1 deletions

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  <Pavel@Janik.cz>
+
+        * 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  <schwab@suse.de>
 
         * 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)