vim: Update from patch 558 to 596