From: Kenichi Handa <handa@m17n.org>
Date: Thu, 3 May 2012 06:57:54 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~471^2~204
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/1f110951b52c0d7705dd5891368efccbce95ec1a

merge trunk
---

1f110951b52c0d7705dd5891368efccbce95ec1a
diff --cc lisp/ChangeLog
index d35f5475bb,69e887f0d1..ff2c5a4078
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,15 +1,21 @@@
 +2012-05-03  Kenichi Handa  <handa@m17n.org>
 +
 +	* mail/rmailmm.el (rmail-show-mime): Catch an error caused by text
 +	decoding, and show a warning message without signalling an error
 +	(Bug#11282).
 +
+ 2012-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* emacs-lisp/bytecomp.el
+ 	(byte-compile-file-form-custom-declare-variable): Compile all elements,
+ 	since cconv.el might have introduced :fun-body, internal-make-closure,
+ 	and friends for bytecomp to handle (bug#11391).
+ 	* custom.el (defcustom): Avoid ((λ ..) ..).
+ 
+ 2012-05-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* subr.el (read-passwd): Better clean after ourselves (bug#11392).
+ 
  2012-05-02  Juanma Barranquero  <lekktu@gmail.com>
  
  	* notifications.el (dbus-debug):