Hi,
I reopen this as it seem it is not fixed.
(Moved from emacs-dev list)
I attach the patch again here, please review and try it.