From: Kenichi Handa <handa@m17n.org>
Date: Wed, 13 Jan 2010 01:33:19 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-23.1.92~45
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1bf28dc12ef1a0f3cecbf78f38795db27b38574;p=emacs.git

merge trunk
---

d1bf28dc12ef1a0f3cecbf78f38795db27b38574
diff --cc src/ChangeLog
index 55e69ff9340,e5bdc50f1c7..6e3fc4ff1c5
--- a/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