mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Code Issues Releases Activity

(merge_properties_sticky): Likewise.

Browse Source
This commit is contained in:
Pavel Janík 2001-12-09 01:03:22 +00:00
parent 8a00d89535
commit 3a62677f47
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ChangeLog
View File

@ -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

2
src/intervals.c
View File

@ -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)