Dmitry Gutov wrote:
>
> The changes look okay to me, but please resend them as an attachment,
> and make sure the patch is against the current master. I couldn't easily
> apply this one.

Okay. I did it that way because I wasn't sure if the bug tracker 
accepted attachments.

The attached patch is against the current master at this commit:

commit de576a55d8c47ffd2e24fca2d48ed99f298d4334
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri Jul 24 10:47:05 2015 +0300

(Created with git format-patch.)
I hope it will work better.

– Harald