Commit 3a62677f authored by Pavel Janík's avatar Pavel Janík
Browse files

(merge_properties_sticky): Likewise.

parent 8a00d895
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
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment