Eli Zaretskii wrote:
> I think we need to fix the rest on the release branch as well.

Ah, sorry, I got confused by the phrase "release branch", and thought the phrase 
referred to master instead of to emacs-25. Anyway, attached is a revised patch 
that I think fixes the whole problem.