merge trunk

diff --cc src/ChangeLog
index 67911d5def3c03bf0ab7b5ccc4af85a86b42dfed,dbd132aa3dc5b2e7002270e775bdf027dd980fb2..959c3fbcb54a815b2f7d4b18dcd11860679e1aa4
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,26 -1,7 +1,30 @@@
 +2010-05-25  Kenichi Handa  <handa@m17n.org>
 +
 +      * dispextern.h (struct composition_it): New members rule_idx and
 +      charpos.
 +
 +      * xdisp.c (set_iterator_to_next): While scanning backward, assume
 +      that the character positions of IT point the last character of the
 +      current grapheme cluster.
 +      (next_element_from_composition): Don't change character positions
 +      of IT.
 +      (append_composite_glyph): Set glyph->charpos to
 +      it->cmp_it.charpos.
 +
 +      * composite.c (autocmp_chars): Change the first argument to RULE,
 +      and try composition with RULE only.
 +      (composition_compute_stop_pos): Record the index number of the
 +      composition rule in CMP_IT->rule_idx.
 +      (composition_reseat_it): Call autocmp_chars repeatedly until the
 +      correct rule of the composition is found.
 +      (composition_update_it): Set CMP_IT->charpos.  Assume the CHARPOS
 +      is at the last character of the current grapheme cluster when
 +      CMP_IT->reversed_p is nonzero.
 +
+ 2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * editfns.c (Fbyte_to_string): New function.
+ 
  2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * process.c (Fmake_network_process): Set :host to nil if it's not used.