Comment 38 for bug 326768

I just tried manually adding Mathias' latest change. That also seems to solve the problem for me. (This was not a full re-install with that patch - just me with vim reverting the old patch and adding that patch. I hope I haven't made any mistakes :)