On 10/23/2017 06:52 PM, Elad Lahav wrote:
> The attached patch seems to work.

Thanks. That appears to be against an older version of Emacs, though. I 
adapted it to emacs-26 (this simplified it) and installed the attached. 
Please give a try, e.g., by running these shell commands:

     git clone -b emacs-26 git://git.sv.gnu.org/emacs.git
     cd emacs
     ./autogen.sh
     ./configure
     make

assuming you have the relevant build tools.