Lars Ingebrigtsen <larsi@gnus.org> writes:

> Arash Esbati <arash@gnu.org> writes:
>>
>> I can provide a new patch and delete the code points, just let me know.
>
> Yes, please do.  

Please find attached the next try.  Let me know if it's Ok and I push it
to Emacs master.

Best, Arash