merge trunk

diff --cc lisp/ChangeLog
index df3551e,8a8f7ef..1301ea3
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,22 +1,28 @@@
 +2010-04-20  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/indian.el (oriya-composable-pattern)
 +      (tamil-composable-pattern, malayalam-composable-pattern): Add
 +      two-part vowels to "v" (vowel sign).
 +
+ 2010-04-20  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * files.el (copy-directory): Handle symlinks (Bug#5982).
+ 
+       * progmodes/compile.el (compilation-next-error-function): Revert
+       2009-10-12 change (Bug#5983).
+ 
+ 2010-04-20  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       * vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
+       (vc-hg-working-revision): Likewise.  Use hg parents, not hg parent
+       (Bug#5846).
+ 
+ 2010-04-20  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.
+ 
+       * minibuffer.el (completion-at-point): Doc fix.
+ 
  2010-04-18  Chong Yidong  <cyd@stupidchicken.com>
  
        * cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Don't