Paul Eggert wrote:

> The attached patch still needs a changelog entry and test cases.

I wrote those up and pushed the attached patch; this should fix the bug so I'm 
closing the bug report.