From: Kenichi Handa <handa@m17n.org>
Date: Fri, 17 Feb 2012 07:33:15 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.94~133
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/48dd1e399f41aa349e8651d049cb4a707ffd0bb0

merge trunk
---

48dd1e399f41aa349e8651d049cb4a707ffd0bb0
diff --cc lisp/ChangeLog
index f7ecfb529f,2e16e59c2d..e2e45bf153
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,10 -1,24 +1,31 @@@
- 2012-02-16  Kenichi Handa  <handa@m17n.org>
++2012-02-17  Kenichi Handa  <handa@m17n.org>
 +
 +	* international/charprop.el:
 +	* international/uni-name.el:
 +	* international/uni-old-name.el:
 +	* international/uni-comment.el: Regenerate.
 +
+ 2012-02-16  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits):
+ 	Interactively in calendar buffer, give an error if not on a date.
+ 
+ 2012-02-15  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* shell.el (shell-delimiter-argument-list):
+ 	Revert 2011-02-17 change.  (Bug#8027)
+ 
+ 2012-02-15  Chong Yidong  <cyd@gnu.org>
+ 
+ 	* minibuffer.el (completion-at-point-functions): Doc fix.
+ 
+ 	* custom.el (defcustom): Doc fix; note use of defvar.
+ 
+ 2012-02-15  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type):
+ 	Doc fixes.
+ 
  2012-02-14  Glenn Morris  <rgm@gnu.org>
  
  	* mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc.