From: Kenichi Handa <handa@gnu.org>
Date: Sat, 15 Sep 2012 06:14:18 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~274
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dcbd9236f7be9da4e658fd559dfbd7454f4b6018;p=emacs.git

merge trunk
---

dcbd9236f7be9da4e658fd559dfbd7454f4b6018
diff --cc src/ChangeLog
index e598d4d465a,b1b4dc8bbcd..88e385c876b
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,16 +1,21 @@@
 +2012-09-15  Kenichi Handa  <handa@gnu.org>
 +
 +	* font.c (Ffont_shape_gstring): Don't adjust grapheme cluster
 +	here, but just check the validity of glyphs in the glyph-string.
 +
+ 2012-09-14  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
+ 	Include "syssignal.h", for 'main_thread'.
+ 
+ 2012-09-14  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+ 	Avoid out-of-range marker position (Bug#12426).
+ 	* insdel.c (replace_range, replace_range_2): Adjust
+ 	markers before overlays, as suggested by comments.
+ 	(insert_1_both, insert_from_buffer_1, adjust_after_replace):
+ 	Remove redundant check before calling offset_intervals.
+ 
  2012-09-14  Martin Rudalics  <rudalics@gmx.at>
  
  	* xdisp.c (Fformat_mode_line): Unconditionally save/restore