Could you pls test it? If it works, I propose to push it to the emacs-26 branch, because the patch is very simple (we know what we're doing, don't we?), and it cures a regression from Emacs 25. Eli? Best regards, Michael.