From: Kenichi Handa <handa@m17n.org>
Date: Mon, 4 Oct 2010 01:53:48 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: emacs-pretest-23.2.90~87
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff06de4f50becfe9d5fc16699531ce9802ee0b7f;p=emacs.git

merge emacs-23
---

ff06de4f50becfe9d5fc16699531ce9802ee0b7f
diff --cc src/ChangeLog
index bb20d5739de,156e64a1d45..53adc561021
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
 +2010-10-04  Kenichi Handa  <handa@m17n.org>
 +
 +	* coding.c (complement_process_encoding_system): Fix previous
 +	change.
 +
+ 2010-10-03  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* dbusbind.c (syms_of_dbusbind): Move putenv call ...
+ 	(Fdbus_init_bus): ... here.  (Bug#7113)
+ 
+ 2010-10-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* buffer.c (before-change-functions, after-change-functions):
+ 	Three-year overdue doc fix following 2007-08-13 change.
+ 
  2010-10-02  Kenichi Handa  <handa@m17n.org>
  
  	* coding.c (coding_inherit_eol_type): If parent doesn't specify