Mercurial > emacs
diff lib-src/ChangeLog @ 108852:c0c86482b2ab
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 30 May 2010 22:54:27 +0000 |
parents | 87dad1e1c860 |
children | d86e65007470 |
line wrap: on
line diff
--- a/lib-src/ChangeLog Fri May 28 00:48:45 2010 +0000 +++ b/lib-src/ChangeLog Sun May 30 22:54:27 2010 +0000 @@ -1,3 +1,9 @@ +2010-05-29 Chong Yidong <cyd@stupidchicken.com> + + * emacsclient.c (longopts, decode_options, print_help_and_exit): + New arg `-parent-id'. + (main): Send parent-id to Emacs. + 2010-05-27 Glenn Morris <rgm@gnu.org> * Makefile.in (distclean): No more Makefile.c.