From: Kenichi Handa <handa@m17n.org>
Date: Wed, 22 Sep 2010 02:56:28 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~44
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1114abdb3d5a0f4f86d7a28f8c523c6f07790208;p=emacs.git

merge trunk
---

1114abdb3d5a0f4f86d7a28f8c523c6f07790208
diff --cc src/ChangeLog
index 063d65475ef,95c00f38c1f..a44d97d96a1
--- a/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.