On Mon, Jul 22, 2024 at 11:00:13PM +0200, Alejandro Colomar wrote: > I've applied patches 1, 2, and 3. I applied some tweaks to 3, which > might be the reason why this doesn't apply. Would you mind rebasing > 4 and 5? Thanks! Thanks for the fixes with \% and \~, I did't know I could do this. I re-sent it as V3 with patches 4/5 and 5/5, it merged cleanly using: git rebase --onto master HEAD^^ my-branch Thank you for the review at such a late hour! ;-) —Günther