Mercurial > emacs

changeset 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 6c7b3dc7c246
children 6e7ebe021a2c a0ac80ce32db
files src/ChangeLog
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri May 14 07:49:16 2010 +0000
+++ b/src/ChangeLog	Fri May 14 12:02:50 2010 +0300
@@ -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>