[Upstream] Merge vi-mode prompt escape code

I've asked upstream to add a prompt escape code (or consider merging this patch) for vi-mode. Here's the link to the issue: https://savannah.gnu.org/support/?109610

As soon as I have an answer from upstream, I'll update this issue.