I tried the proposed patches with current Emacs master on Fedora 30 
x86-64 and got a test failure as shown in the attached file. Could you 
please look into that? Thanks.