(merge_properties_sticky): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dc657958293c4d42a69a0f34ed7b8c83f4c242a..f0c67b814ad4e9357d34642a78f800dd663f88c6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2001-12-09  Pavel Jan\e,Bm\e(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 c1a088b1065557e907f4cac1ce03052872d3005d..5a6ff4f47d52664a1f3fd60de4fe1ac6593d5466 100644 (file)
--- 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)