vim: improved delimit-mate matching