Attached is an updated version of the patch,
made in the light of the comments at
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10150#23>.

This patch adds a NEWS update.  The patch
assumes the "Renamed functions" section mentioned in
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10052#8>.