merge trunk

diff --cc src/ChangeLog
index e598d4d465a832e2d2b294c06a5b5356b5b4cf42,b1b4dc8bbcdfd629afdf5a2e75a63b5862e3a739..88e385c876bbc9d33fdba0a928abdf9d231b2188
--- 1/src/ChangeLog
--- 2/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