From: Eli Zaretskii Date: Fri, 14 May 2010 09:02:50 +0000 (+0300) Subject: Fix spelling and remove merge marks due to 2010-05-14T04:14:23Z!handa@etlken. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~208^2~76 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4b6e17e0077ab70fcc967a432cd12e9d24b8720;p=emacs.git Fix spelling and remove merge marks due to 2010-05-14T04:14:23Z!handa@etlken. --- diff --git a/src/ChangeLog b/src/ChangeLog index 5d47f437d4a..962f439de44 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,7 +6,7 @@ ENDPOS < CHARPOS. (composition_reseat_it): Handle the case that ENDPOS < CHARPOS. Set CMP_IT->reversed_p. - (composition_update_it): Pay attention ot CMP_IT->reversed_p. + (composition_update_it): Pay attention to CMP_IT->reversed_p. * xdisp.c (set_iterator_to_next): Call composition_compute_stop_pos with negative ENDPOS if we are @@ -102,7 +102,6 @@ * xdisp.c (init_iterator): Don't turn on bidi reordering in unibyte buffers. See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. ->>>>>>> MERGE-SOURCE 2010-05-10 Glenn Morris