bug#21953: Eliminate warnings in the emacs-25 release branch

[Eli Zaretskii]

> From: David Engster <deng@randomsample.de>
> Date: Thu, 19 Nov 2015 21:01:35 +0100
> Cc: Dmitry Gutov <dgutov@yandex.ru>, Richard Stallman <rms@gnu.org>,
>       21953@debbugs.gnu.org
> 
> I will have to do one last merge, but before I can do that, I have to
> port our test suite to make sure I do it correctly. I hope I will find
> the time to do all this before the new year.

I think this is good enough, thanks.