merge trunk

diff --cc src/ChangeLog
index 063d65475ef30d022fc1339e917238a3e8aeeaad,95c00f38c1fab6a4cb2d5be85053914d0fd65cb7..a44d97d96a1e9a68ea54e8ce467ff3c0a2845d44
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,15 -1,12 +1,24 @@@
 +2010-09-22  Kenichi Handa  <handa@m17n.org>
 +
 +      * xdisp.c (compute_stop_pos): Call composition_compute_stop_pos
 +      only if we are not at a composition.
 +      (set_iterator_to_next): Give it->end_charpos to
 +      composition_compute_stop_pos.
 +      (set_iterator_to_next, next_element_from_buffer): Likewise.
 +
 +      * dispnew.c (buffer_posn_from_coords): Fix position when the
 +      current display element is a grapheme cluster in bidi-reordered
 +      region.
 +
+ 2010-09-21  Ari Roponen  <ari.roponen@gmail.com>  (tiny change)
+ 
+       * doc.c (Fsnarf_documentation): Use memmove instead of memcpy as
+       the regions may overlap.
+ 
+ 2010-09-21  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies.
+ 
  2010-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
  
        * emacs.c: Do not include sys/ioctl.h, not needed.