merge trunk

diff --cc src/ChangeLog
index 55e69ff93404a3b2e3ceb26d2f0d539cb94a9ad2,e5bdc50f1c790f9574cfe8dcce3fdb2fa8123059..6e3fc4ff1c5b006ca1733ff375e09df215d33a8e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,21 -1,17 +1,35 @@@
 +2010-01-13  Kenichi Handa  <handa@m17n.org>
 +
 +      Display buffer name, etc. in mode line by composing correctly.
 +
 +      * xdisp.c (reseat_to_string): Call composition_compute_stop_pos if
 +      STRING is not nil.
 +      (display_mode_element): Adjusted for the change of
 +      decode_mode_spec and display_line.
 +      (decode_mode_spec): Change arg MULTIBYTE to STRING.
 +      (display_string): Handle the case that STRING is non-null and
 +      LISP_STRING is not nil.
 +
 +      * xterm.c (x_draw_composite_glyph_string_foreground): Pay
 +      attention to s->face->overstrike.
 +
 +      * composite.c (composition_reseat_it): Don't check PT if STRING is
 +      non nil.
 +
+ 2010-01-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * keyboard.c (read_char): Don't apply previous change when current
+       buffer is unchanged by command execution.
+ 
+ 2010-01-12  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * keyboard.c (read_char): Return after executing from special map.
+ 
+ 2010-01-12  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Set it to
+       bug-gnu-emacs rather than emacs-pretest-bug.
+ 
  2010-01-11  Chong Yidong  <cyd@stupidchicken.com>
  
        * nsterm.m (syms_of_nsterm): Initialize Qcontrol etc. before