From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Apr 2010 18:23:51 +0000 (+0300)
Subject: Fix display of composed characters from L2R scripts in bidi buffers. (Bug#5977)
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~410
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=728588ccfd643b2161a186ee782db7695a1d9118;p=emacs.git

Fix display of composed characters from L2R scripts in bidi buffers. (Bug#5977)

 xdisp.c (set_iterator_to_next, next_element_from_composition):
 After advancing IT past the composition, resync the bidi iterator
 with IT's position.
---

728588ccfd643b2161a186ee782db7695a1d9118
diff --cc src/ChangeLog
index 73e0d967678,f5f6e8c4421..2a7212d8b26
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,5 +1,23 @@@
+ 2010-04-23  Eli Zaretskii  <eliz@gnu.org>
+ 
++	Fix display of composed characters from L2R scripts in bidi buffers.
++	* xdisp.c (set_iterator_to_next, next_element_from_composition):
++	After advancing IT past the composition, resync the bidi iterator
++	with IT's position.  (Bug#5977)
++
 +2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 +
 +	* Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused.
 +	(TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS.
 +
 +2010-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
 +
 +2010-04-23  Eli Zaretskii  <eliz@gnu.org>
 +
 +	Support `display' text properties and overlay strings in bidi
 +	buffers.
  	* xdisp.c (pop_it): When the stack is popped after displaying
  	from a string, bidi-iterate to exit from the text portion covered
  	by the `display' property or overlay.  (Bug#5988, bug#5920)