from trunk

diff --cc lisp/ChangeLog
index 28aa28403499b72c0c2f9872830f905ce380d016,5a18f2876ddabb2ca5de4c792fb6513e407f13d5..2edeaf1789464a649e86b5023b3f36b9d4875e6e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,40 +1,45 @@@
 +2010-03-08  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/misc-lang.el (windows-1256): New coding system.
 +      (cp1256): New alias of windows-1256 (bug#5684).
 +
+ 2010-03-07  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * mail/rfc822.el (rfc822-addresses): Move catch clause down around
+       call to rfc822-bad-address.  (Bug#5692)
+ 
+ 2010-03-07  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
+ 
+       * vc-git.el (vc-git-annotate-extract-revision-at-line): Use
+       vc-git-root as default direcotry for revision path (Bug#5657).
+ 
+ 2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * calculator.el (calculator): Don't bind split-window-keep-point
+       (Bug#5674).
+ 
+ 2010-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * vc-git.el: Re-flow to fit into 80 columns.
+       (vc-git-after-dir-status-stage, vc-git-dir-status-goto-stage):
+       Remove spurious `quote' element in each case alternative.
+       (vc-git-show-log-entry): Use prog1.
+       (vc-git-after-dir-status-stage): Remove unused var `remaining'.
+ 
+ 2010-03-06  Glenn Morris  <rgm@gnu.org>
+ 
+       * cedet/semantic/grammar.el (semantic-grammar-header-template):
+       Update template copyright to GPLv3+.
+ 
+ 2010-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * man.el (Man-files-regexp): Tighten up the regexp (bug#5686).
+ 
+ 2010-03-03  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * macros.el (insert-kbd-macro): Look up keyboard macro using the
+       definition, not the name (Bug#5481).
+ 
  2010-03-03  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
  
        * subr.el (momentary-string-display): Don't overwrite the MESSAGE