Eli Zaretskii <eliz@gnu.org> writes:

> This is why I said in the documentation what I think should happen,
> although I did see the regexp we offer as the default.  Patches to
> make the code do what it should are welcome.

Here is a patch: