Mercurial > emacs

comparison src/ChangeLog @ 108568:b2ed92d57b33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix spelling and remove merge marks due to revno 100276.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 14 May 2010 12:02:50 +0300
parents be6f5247ebb4
children a476fd5a6f42
comparison
equal deleted inserted replaced
108567:6c7b3dc7c246 108568:b2ed92d57b33
4 4
5 * composite.c (composition_compute_stop_pos): Search backward if 5 * composite.c (composition_compute_stop_pos): Search backward if
6 ENDPOS < CHARPOS. 6 ENDPOS < CHARPOS.
7 (composition_reseat_it): Handle the case that ENDPOS < CHARPOS. 7 (composition_reseat_it): Handle the case that ENDPOS < CHARPOS.
8 Set CMP_IT->reversed_p. 8 Set CMP_IT->reversed_p.
9 (composition_update_it): Pay attention ot CMP_IT->reversed_p. 9 (composition_update_it): Pay attention to CMP_IT->reversed_p.
10 10
11 * xdisp.c (set_iterator_to_next): Call 11 * xdisp.c (set_iterator_to_next): Call
12 composition_compute_stop_pos with negative ENDPOS if we are 12 composition_compute_stop_pos with negative ENDPOS if we are
13 scanning backward. Call composition_compute_stop_pos if scan 13 scanning backward. Call composition_compute_stop_pos if scan
14 direction is changed. 14 direction is changed.
100 2010-05-10 Eli Zaretskii <eliz@gnu.org> 100 2010-05-10 Eli Zaretskii <eliz@gnu.org>
101 101
102 * xdisp.c (init_iterator): Don't turn on bidi reordering in 102 * xdisp.c (init_iterator): Don't turn on bidi reordering in
103 unibyte buffers. See 103 unibyte buffers. See
104 http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. 104 http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html.
105 >>>>>>> MERGE-SOURCE
106 105
107 2010-05-10 Glenn Morris <rgm@gnu.org> 106 2010-05-10 Glenn Morris <rgm@gnu.org>
108 107
109 * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. 108 * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.
110 (LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM. 109 (LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM.