Eli Zaretskii <eliz@gnu.org> writes:

> Is the last patch okay to install?  If not, Elijah, would you please
> submit an updated patch?

Sure, I'm sending here a better version.

I made a few minor changes since I found several bugs.
If there are no objections, the patch is ready to be installed.