Re: [AC21.5] Fix ChangeLogs

APPROVE COMMIT 21.5 I'm not sure how this happened, whether it's a side effect of a Mercurial operation or a careless merge by hand, but please be really careful to ensure that the release Herald markers are not disturbed when pushing. It would be nice if the logs were in order of commits (and there are definitely similar artifacts in several logs), but it's not such a big deal within a version.

It is important that commits that occur *after* a release do not appear in the logs *before* the release and vice versa.

diff -r 9dc294ae3004 -r 9f1c9f957073 lisp/ChangeLog --- a/lisp/ChangeLog Fri Dec 14 01:19:36 2012 +0100 +++ b/lisp/ChangeLog Mon Dec 24 01:07:25 2012 +0900 ＠＠ -51,15 +51,15 ＠＠ Removed. Move this to C, so we can use look_for_coding_system_magic_cookie(). -2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; - - * XEmacs 21.5.32 "habanero" is released. - 2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * help.el (describe-function-1): Document any command remapping that has been done in this function. +2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * XEmacs 21.5.32 "habanero" is released. + 2012-05-14 Aidan Kehoe <kehoea(a)parhasard.net&gt; * byte-optimize.el (byte-optimize-letX): diff -r 9dc294ae3004 -r 9f1c9f957073 man/ChangeLog --- a/man/ChangeLog Fri Dec 14 01:19:36 2012 +0100 +++ b/man/ChangeLog Mon Dec 24 01:07:25 2012 +0900 ＠＠ -17,10 +17,6 ＠＠ Document the new syntax of ## for the symbol with name "" interned in obarray. -2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; - - * XEmacs 21.5.32 "habanero" is released. - 2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * lispref/keymaps.texi (Keymaps): ＠＠ -31,6 +27,10 ＠＠ * lispref/keymaps.texi (Other Keymap Functions): Document the new command remapping functionality in this file. +2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * XEmacs 21.5.32 "habanero" is released. + 2012-05-06 Aidan Kehoe <kehoea(a)parhasard.net&gt; * lispref/macros.texi (Expansion): diff -r 9dc294ae3004 -r 9f1c9f957073 src/ChangeLog --- a/src/ChangeLog Fri Dec 14 01:19:36 2012 +0100 +++ b/src/ChangeLog Mon Dec 24 01:07:25 2012 +0900 ＠＠ -89,10 +89,6 ＠＠ Adopt GNU's ## syntax for the interned symbol with the zero-length name. -2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; - - * XEmacs 21.5.32 "habanero" is released. - 2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * keymap.c: ＠＠ -128,6 +124,10 ＠＠ * keymap.c (complex_vars_of_keymap): * lisp.h: New CHECK_COMMAND macro. +2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * XEmacs 21.5.32 "habanero" is released. + 2012-05-14 Aidan Kehoe <kehoea(a)parhasard.net&gt; * minibuf.c (Ftest_completion): diff -r 9dc294ae3004 -r 9f1c9f957073 tests/ChangeLog --- a/tests/ChangeLog Fri Dec 14 01:19:36 2012 +0100 +++ b/tests/ChangeLog Mon Dec 24 01:07:25 2012 +0900 ＠＠ -14,15 +14,15 ＠＠ Make sure we can search for character ranges successfully when the syntax table is dirty. -2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; - - * XEmacs 21.5.32 "habanero" is released. - 2012-09-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * automated/keymap-tests.el: Test the new command remapping functionality. +2012-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * XEmacs 21.5.32 "habanero" is released. + 2012-05-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; * automated/mule-tests.el: