Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Paul Eggert]

Lars Ingebrigtsen wrote:
> I hope that didn't ... destroy anything.

This is git, so nothing is ever destroyed, it's just ... mutated.

I repaired the problems I found in master commit 
39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4.  Your commit merged from emacs-24, 
which is generally a good thing to do, so I left that part alone.

I didn't fix the dates in the ChangeLogs; you can take a look at those.  The 
convention is that the dates are supposed to be as of the merge, not as of the 
original checkin.  Which reminds me, we need to get the ball rolling again on 
having ChangeLogs generated automatically, to avoid that part of the merge 
hassle in the future.