From: Kenichi Handa <handa@m17n.org>
Date: Fri, 14 Jan 2011 04:08:30 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: emacs-pretest-23.2.92~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66399c0a66e87c20edad6a7eb2474981d9bc7e4e;p=emacs.git

merge emacs-23
---

66399c0a66e87c20edad6a7eb2474981d9bc7e4e
diff --cc lisp/ChangeLog
index 9ed8ee80c89,f0fe42a5913..0f6138bf698
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,14 -1,7 +1,18 @@@
 +2011-01-14  Kenichi Handa  <handa@m17n.org>
 +
 +	* mail/rmailmm.el (rmail-mime-insert-header): Set
 +	rmail-mime-coding-system to a cons whose car is the last coding
 +	system used to decode the header.
 +	(rmail-mime-find-header-encoding): New function.
 +	(rmail-mime-insert-decoded-text): Override
 +	rmail-mime-coding-system if it is a cons.
 +	(rmail-show-mime): If only a header part was decoded, find the
 +	coding system while ignoring mm-charset-override-alist.
 +
+ 2011-01-13  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* subr.el (event-start, event-end): Doc fix (Bug#7826).
+ 
  2011-01-12  Kenichi Handa  <handa@m17n.org>
  
  	* mail/rmailmm.el (rmail-mime-next-item)