Commit b4b6e17e authored by Eli Zaretskii's avatar Eli Zaretskii

Fix spelling and remove merge marks due to 2010-05-14T04:14:23Z!handa@etlken.

parent d567e92f
......@@ -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 <rgm@gnu.org>
......
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